Title: [135585] trunk
- Revision
- 135585
- Author
- [email protected]
- Date
- 2012-11-23 03:29:44 -0800 (Fri, 23 Nov 2012)
Log Message
[Qt] Compiling against QtWebkit API requires QT_DLL to be defined
https://bugs.webkit.org/show_bug.cgi?id=102942
Reviewed by Tor Arne Vestbø.
Remove the requirement of having QT_DLL defined in order for the QWEBKIT_EXPORT
macro to be defined as Q_DECL_IMPORT. Instead unify the export macro definition
to follow the same rules as other Qt 5 modules, with the exception that instead of
QT_BUILD_WEBKIT_LIB we continue to use BUILDING_WEBKIT, because that's used also
in other cross-platform header files to determine the correct meaning of export
macros.
Source/WebKit/qt:
* Api/qwebkitglobal.h:
Tools:
* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/win32/default_post.prf:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebkitglobal.h (135584 => 135585)
--- trunk/Source/WebKit/qt/Api/qwebkitglobal.h 2012-11-23 11:27:30 UTC (rev 135584)
+++ trunk/Source/WebKit/qt/Api/qwebkitglobal.h 2012-11-23 11:29:44 UTC (rev 135585)
@@ -28,22 +28,14 @@
// Use: #if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 0, 0)). Similar to Qt.
#define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
-#if defined(QT_MAKEDLL) /* create a Qt DLL library */
+#ifndef QT_STATIC
# if defined(BUILDING_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
+#else
+# define QWEBKIT_EXPORT
#endif
-#if !defined(QWEBKIT_EXPORT)
-# if defined(QT_SHARED)
-# define QWEBKIT_EXPORT Q_DECL_EXPORT
-# else
-# define QWEBKIT_EXPORT
-# endif
-#endif
-
#endif // QWEBKITGLOBAL_H
Modified: trunk/Source/WebKit/qt/ChangeLog (135584 => 135585)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-23 11:27:30 UTC (rev 135584)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-23 11:29:44 UTC (rev 135585)
@@ -1,5 +1,21 @@
2012-11-23 Simon Hausmann <[email protected]>
+ [Qt] Compiling against QtWebkit API requires QT_DLL to be defined
+ https://bugs.webkit.org/show_bug.cgi?id=102942
+
+ Reviewed by Tor Arne Vestbø.
+
+ Remove the requirement of having QT_DLL defined in order for the QWEBKIT_EXPORT
+ macro to be defined as Q_DECL_IMPORT. Instead unify the export macro definition
+ to follow the same rules as other Qt 5 modules, with the exception that instead of
+ QT_BUILD_WEBKIT_LIB we continue to use BUILDING_WEBKIT, because that's used also
+ in other cross-platform header files to determine the correct meaning of export
+ macros.
+
+ * Api/qwebkitglobal.h:
+
+2012-11-23 Simon Hausmann <[email protected]>
+
[Qt] QWebPage::shouldInterruptJavaScript should be virtual in Qt 5
https://bugs.webkit.org/show_bug.cgi?id=103111
Modified: trunk/Tools/ChangeLog (135584 => 135585)
--- trunk/Tools/ChangeLog 2012-11-23 11:27:30 UTC (rev 135584)
+++ trunk/Tools/ChangeLog 2012-11-23 11:29:44 UTC (rev 135585)
@@ -1,5 +1,22 @@
2012-11-23 Simon Hausmann <[email protected]>
+ [Qt] Compiling against QtWebkit API requires QT_DLL to be defined
+ https://bugs.webkit.org/show_bug.cgi?id=102942
+
+ Reviewed by Tor Arne Vestbø.
+
+ Remove the requirement of having QT_DLL defined in order for the QWEBKIT_EXPORT
+ macro to be defined as Q_DECL_IMPORT. Instead unify the export macro definition
+ to follow the same rules as other Qt 5 modules, with the exception that instead of
+ QT_BUILD_WEBKIT_LIB we continue to use BUILDING_WEBKIT, because that's used also
+ in other cross-platform header files to determine the correct meaning of export
+ macros.
+
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/win32/default_post.prf:
+
+2012-11-23 Simon Hausmann <[email protected]>
+
[Qt] QWebPage::shouldInterruptJavaScript should be virtual in Qt 5
https://bugs.webkit.org/show_bug.cgi?id=103111
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (135584 => 135585)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-11-23 11:27:30 UTC (rev 135584)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-11-23 11:29:44 UTC (rev 135585)
@@ -156,7 +156,7 @@
DEFINES += BUILDING_$${TARGET}
# Triggers the right export macro for the QtWebKit API (see qwebkitglobal.h)
- DEFINES += BUILDING_WEBKIT
+ !contains(QT, webkitwidgets): DEFINES += BUILDING_WEBKIT
# Prevent name clashes when building both debug and release. Qt5's module
# system already takes care of this for the top level QtWebKit library.
Modified: trunk/Tools/qmake/mkspecs/features/win32/default_post.prf (135584 => 135585)
--- trunk/Tools/qmake/mkspecs/features/win32/default_post.prf 2012-11-23 11:27:30 UTC (rev 135584)
+++ trunk/Tools/qmake/mkspecs/features/win32/default_post.prf 2012-11-23 11:29:44 UTC (rev 135585)
@@ -39,5 +39,3 @@
GENERATED_SOURCES += $$forwarded_exports.target
}
-# To ensure the Qt export macros are set to dllexport
-contains(TEMPLATE, lib):!contains(QT, webkitwidgets): DEFINES += QT_MAKEDLL
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
