Attachment #29103 for bug #24841

View Details Raw Unified Return to Bug 24841

| Differences between



2009-03-30  Laszlo Gombos  <laszlo.1.gombos@nokia.com>

        Reviewed by NOBODY (OOPS!).

        https://bugs.webkit.org/show_bug.cgi?id=24841

        Fix linking against QtWebKit for Symbian and other platforms
        where the OS ABI distinguishes between an import or an export situation.

        * Api/qwebkitglobal.h: Instead of white-listing Win, remove the test.

2009-03-30  Simon Hausmann  <simon.hausmann@nokia.com>

        Rubber-stamped by Tor Arne Vestbø.




#include <QtCore/qglobal.h>

#if defined(QT_MAKEDLL)        /* create a Qt DLL library */
#  if defined(BUILD_WEBKIT)
#      define QWEBKIT_EXPORT Q_DECL_EXPORT
#  else
#      define QWEBKIT_EXPORT Q_DECL_IMPORT
#    if defined(QT_DLL)
#      undef QT_DLL
#    endif
#    if defined(BUILD_WEBKIT)
#        define QWEBKIT_EXPORT Q_DECL_EXPORT
#    else
#        define QWEBKIT_EXPORT Q_DECL_IMPORT
#    endif
#  elif defined(QT_DLL) /* use a Qt DLL library */
#    define QWEBKIT_EXPORT Q_DECL_IMPORT
#  endif
#elif defined(QT_DLL) /* use a Qt DLL library */
#  define QWEBKIT_EXPORT Q_DECL_IMPORT
#endif

#if !defined(QWEBKIT_EXPORT)

Return to Bug 24841

Lines 22-43 WebKit/qt/Api/qwebkitglobal.h_sec1
- WebKit/qt/Api/qwebkitglobal.h -15 / +7 lines
22		22
23	#include <QtCore/qglobal.h>	23	#include <QtCore/qglobal.h>
24		24
25	#if defined(Q_OS_WIN)	25	#if defined(QT_MAKEDLL) /* create a Qt DLL library */
26	# if defined(QT_NODLL)	26	# if defined(BUILD_WEBKIT)
27	# undef QT_MAKEDLL	27	# define QWEBKIT_EXPORT Q_DECL_EXPORT
28	# undef QT_DLL	28	# else
29	# elif defined(QT_MAKEDLL) /* create a Qt DLL library */	29	# define QWEBKIT_EXPORT Q_DECL_IMPORT
30	# if defined(QT_DLL)
31	# undef QT_DLL
32	# endif
33	# if defined(BUILD_WEBKIT)
34	# define QWEBKIT_EXPORT Q_DECL_EXPORT
35	# else
36	# define QWEBKIT_EXPORT Q_DECL_IMPORT
37	# endif
38	# elif defined(QT_DLL) /* use a Qt DLL library */
39	# define QWEBKIT_EXPORT Q_DECL_IMPORT
40	# endif	30	# endif
		31	#elif defined(QT_DLL) /* use a Qt DLL library */
		32	# define QWEBKIT_EXPORT Q_DECL_IMPORT
41	#endif	33	#endif
42		34
43	#if !defined(QWEBKIT_EXPORT)	35	#if !defined(QWEBKIT_EXPORT)

Lines 1-3 WebKit/qt/ChangeLog_sec1
- WebKit/qt/ChangeLog +11 lines
		1	2009-03-30 Laszlo Gombos <laszlo.1.gombos@nokia.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	https://bugs.webkit.org/show_bug.cgi?id=24841
		6
		7	Fix linking against QtWebKit for Symbian and other platforms
		8	where the OS ABI distinguishes between an import or an export situation.
		9
		10	* Api/qwebkitglobal.h: Instead of white-listing Win, remove the test.
		11
1	2009-03-30 Simon Hausmann <simon.hausmann@nokia.com>	12	2009-03-30 Simon Hausmann <simon.hausmann@nokia.com>
2		13
3	Rubber-stamped by Tor Arne Vestbø.	14	Rubber-stamped by Tor Arne Vestbø.