Changeset 88455 in webkit

Timestamp:

Jun 9, 2011 9:05:08 AM (13 years ago)

Author:

abecsi@webkit.org

Message:

2011-06-09 Andras Becsi <​abecsi@webkit.org>

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.

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• QtWebKit.pro (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-06-09  Andras Becsi  <abecsi@webkit.org>
+
+        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  <robert@webkit.org>
 

trunk/Source/WebKit/qt/QtWebKit.pro

@@ -80 +80 @@
 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