Title: [88350] trunk/Source
- Revision
- 88350
- Author
- yael.aha...@nokia.com
- Date
- 2011-06-08 08:28:27 -0700 (Wed, 08 Jun 2011)
Log Message
2011-06-08 Yael Aharon <yael.aha...@nokia.com>
Reviewed by Andreas Kling.
[Qt] Build fix for building QtWebKit inside of Qt.
https://bugs.webkit.org/show_bug.cgi?id=62280
Remove CONFIG=staticlib, because it causes the configure script to add -ljavascriptcore
into QtWebKit.prl.
No new tests, as this is just a build fix.
* _javascript_Core.pri:
2011-06-08 Yael Aharon <yael.aha...@nokia.com>
Reviewed by Andreas Kling.
[Qt] Build fix for building QtWebKit inside of Qt.
https://bugs.webkit.org/show_bug.cgi?id=62280
Remove CONFIG=staticlib, because it causes the configure script to add -lwebcore
into QtWebKit.prl.
No new tests, as this is just a build fix.
* WebCore.pri:
2011-06-08 Yael Aharon <yael.aha...@nokia.com>
Reviewed by Andreas Kling.
[Qt] Build fix for building QtWebKit inside of Qt.
https://bugs.webkit.org/show_bug.cgi?id=62280
Remove CONFIG=staticlib, because it causes the configure script to add -lwebkit2
into QtWebKit.prl.
* WebKit2.pri:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (88349 => 88350)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-08 15:24:41 UTC (rev 88349)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-08 15:28:27 UTC (rev 88350)
@@ -1,3 +1,17 @@
+2011-06-08 Yael Aharon <yael.aha...@nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Build fix for building QtWebKit inside of Qt.
+ https://bugs.webkit.org/show_bug.cgi?id=62280
+
+ Remove CONFIG=staticlib, because it causes the configure script to add -ljavascriptcore
+ into QtWebKit.prl.
+
+ No new tests, as this is just a build fix.
+
+ * _javascript_Core.pri:
+
2011-06-07 Geoffrey Garen <gga...@apple.com>
Reviewed by Oliver Hunt.
Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (88349 => 88350)
--- trunk/Source/_javascript_Core/_javascript_Core.pri 2011-06-08 15:24:41 UTC (rev 88349)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri 2011-06-08 15:28:27 UTC (rev 88350)
@@ -102,6 +102,7 @@
# 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
export(QMAKE_LIBDIR)
export(LIBS)
Modified: trunk/Source/WebCore/ChangeLog (88349 => 88350)
--- trunk/Source/WebCore/ChangeLog 2011-06-08 15:24:41 UTC (rev 88349)
+++ trunk/Source/WebCore/ChangeLog 2011-06-08 15:28:27 UTC (rev 88350)
@@ -1,3 +1,17 @@
+2011-06-08 Yael Aharon <yael.aha...@nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Build fix for building QtWebKit inside of Qt.
+ https://bugs.webkit.org/show_bug.cgi?id=62280
+
+ Remove CONFIG=staticlib, because it causes the configure script to add -lwebcore
+ into QtWebKit.prl.
+
+ No new tests, as this is just a build fix.
+
+ * WebCore.pri:
+
2011-06-08 Vsevolod Vlasov <vse...@chromium.org>
Reviewed by Pavel Feldman.
Modified: trunk/Source/WebCore/WebCore.pri (88349 => 88350)
--- trunk/Source/WebCore/WebCore.pri 2011-06-08 15:24:41 UTC (rev 88349)
+++ trunk/Source/WebCore/WebCore.pri 2011-06-08 15:28:27 UTC (rev 88350)
@@ -372,6 +372,7 @@
}
CONFIG -= explicitlib
+ CONFIG -= staticlib
export(QMAKE_LIBDIR)
export(POST_TARGETDEPS)
export(CONFIG)
Modified: trunk/Source/WebKit2/ChangeLog (88349 => 88350)
--- trunk/Source/WebKit2/ChangeLog 2011-06-08 15:24:41 UTC (rev 88349)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-08 15:28:27 UTC (rev 88350)
@@ -1,3 +1,15 @@
+2011-06-08 Yael Aharon <yael.aha...@nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Build fix for building QtWebKit inside of Qt.
+ https://bugs.webkit.org/show_bug.cgi?id=62280
+
+ Remove CONFIG=staticlib, because it causes the configure script to add -lwebkit2
+ into QtWebKit.prl.
+
+ * WebKit2.pri:
+
2011-06-07 Tim Horton <timothy_hor...@apple.com>
Reviewed by Alexey Proskuryakov.
Modified: trunk/Source/WebKit2/WebKit2.pri (88349 => 88350)
--- trunk/Source/WebKit2/WebKit2.pri 2011-06-08 15:24:41 UTC (rev 88349)
+++ trunk/Source/WebKit2/WebKit2.pri 2011-06-08 15:28:27 UTC (rev 88350)
@@ -89,6 +89,7 @@
# The following line is to prevent qmake from adding webkit2 to libQtWebKit's prl dependencies.
CONFIG -= explicitlib
+ CONFIG -= staticlib
export(QMAKE_LIBDIR)
export(POST_TARGETDEPS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
