Title: [88455] trunk/Source/WebKit/qt
- Revision
- 88455
- Author
- [email protected]
- Date
- 2011-06-09 09:05:08 -0700 (Thu, 09 Jun 2011)
Log Message
2011-06-09 Andras Becsi <[email protected]>
Reviewed by Andreas Kling.
[Qt] Fix the in-tree build on Linux
https://bugs.webkit.org/show_bug.cgi?id=62378
In case of an in-tree build qmake generates defect prl dependencies for
the QtWebKit library, because the inclusion of qtbase.pri adds explicitlib to CONFIG.
* QtWebKit.pro: Remove explicitlib and staticlib from CONFIG.
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (88454 => 88455)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-09 15:52:13 UTC (rev 88454)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-09 16:05:08 UTC (rev 88455)
@@ -1,3 +1,15 @@
+2011-06-09 Andras Becsi <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix the in-tree build on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=62378
+
+ In case of an in-tree build qmake generates defect prl dependencies for
+ the QtWebKit library, because the inclusion of qtbase.pri adds explicitlib to CONFIG.
+
+ * QtWebKit.pro: Remove explicitlib and staticlib from CONFIG.
+
2011-06-09 Robert Hogan <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (88454 => 88455)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-06-09 15:52:13 UTC (rev 88454)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-06-09 16:05:08 UTC (rev 88455)
@@ -79,6 +79,11 @@
CONFIG(QTDIR_build) {
include($$QT_SOURCE_TREE/src/qbase.pri)
+ # The following lines are to prevent qmake from adding the jscore, webcore and webkit2 libs to libQtWebKit's prl dependencies.
+ # The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit and QtScript
+ # statically in applications (which isn't used often because, among other things, of licensing obstacles).
+ CONFIG -= explicitlib
+ CONFIG -= staticlib
} else {
DESTDIR = $$OUTPUT_DIR/lib
symbian: TARGET =$$TARGET$${QT_LIBINFIX}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
