Title: [121848] trunk
- Revision
- 121848
- Author
- [email protected]
- Date
- 2012-07-04 06:54:43 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Remove a few un-needed load(features) after r121777
The features are computed by configure.pro and cached in .qmake.cache.
Reviewed by Jocelyn Turcotte.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (121847 => 121848)
--- trunk/Source/WebKit/ChangeLog 2012-07-04 13:48:44 UTC (rev 121847)
+++ trunk/Source/WebKit/ChangeLog 2012-07-04 13:54:43 UTC (rev 121848)
@@ -1,5 +1,15 @@
2012-07-04 Tor Arne Vestbø <[email protected]>
+ [Qt] Remove a few un-needed load(features) after r121777
+
+ The features are computed by configure.pro and cached in .qmake.cache.
+
+ Reviewed by Jocelyn Turcotte.
+
+ * WebKit1.pro:
+
+2012-07-04 Tor Arne Vestbø <[email protected]>
+
[Qt] Fix broken OR-operator in project file
Qmake expects |, not ||. The result was that the block was entered, even
Modified: trunk/Source/WebKit/WebKit1.pro (121847 => 121848)
--- trunk/Source/WebKit/WebKit1.pro 2012-07-04 13:48:44 UTC (rev 121847)
+++ trunk/Source/WebKit/WebKit1.pro 2012-07-04 13:54:43 UTC (rev 121848)
@@ -7,8 +7,6 @@
TEMPLATE = lib
TARGET = WebKit1
-load(features)
-
include(WebKit1.pri)
WEBKIT += wtf _javascript_core webcore
Modified: trunk/Tools/ChangeLog (121847 => 121848)
--- trunk/Tools/ChangeLog 2012-07-04 13:48:44 UTC (rev 121847)
+++ trunk/Tools/ChangeLog 2012-07-04 13:54:43 UTC (rev 121848)
@@ -1,5 +1,15 @@
2012-07-04 Tor Arne Vestbø <[email protected]>
+ [Qt] Remove a few un-needed load(features) after r121777
+
+ The features are computed by configure.pro and cached in .qmake.cache.
+
+ Reviewed by Jocelyn Turcotte..
+
+ * MiniBrowser/qt/raw/Target.pri:
+
+2012-07-04 Tor Arne Vestbø <[email protected]>
+
[Qt] Use haveQtModule() in project files instead of manual checks
Reviewed by Jocelyn Turcotte.
Modified: trunk/Tools/MiniBrowser/qt/raw/Target.pri (121847 => 121848)
--- trunk/Tools/MiniBrowser/qt/raw/Target.pri 2012-07-04 13:48:44 UTC (rev 121847)
+++ trunk/Tools/MiniBrowser/qt/raw/Target.pri 2012-07-04 13:54:43 UTC (rev 121848)
@@ -11,6 +11,4 @@
QT = core gui network webkit
-load(features)
-
WEBKIT += wtf _javascript_core webkit2
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
