Title: [121845] trunk/Source/WebKit
- Revision
- 121845
- Author
- [email protected]
- Date
- 2012-07-04 06:41:19 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Fix broken OR-operator in project file
Qmake expects |, not ||. The result was that the block was entered, even
if none of the two defines were set to 1.
Reviewed by Jocelyn Turcotte.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (121844 => 121845)
--- trunk/Source/WebKit/ChangeLog 2012-07-04 12:57:58 UTC (rev 121844)
+++ trunk/Source/WebKit/ChangeLog 2012-07-04 13:41:19 UTC (rev 121845)
@@ -1,3 +1,14 @@
+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
+ if none of the two defines were set to 1.
+
+ Reviewed by Jocelyn Turcotte.
+
+ * WebKit1.pri:
+
2012-07-03 Christophe Dumez <[email protected]>
[EFL] Move BatteryClientEfl from WebKit to WebCore
Modified: trunk/Source/WebKit/WebKit1.pri (121844 => 121845)
--- trunk/Source/WebKit/WebKit1.pri 2012-07-04 12:57:58 UTC (rev 121844)
+++ trunk/Source/WebKit/WebKit1.pri 2012-07-04 13:41:19 UTC (rev 121845)
@@ -27,7 +27,7 @@
}
}
-contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) || contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1) {
+contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1)|contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1) {
haveQt(5) {
QT += sensors
} else {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
