Title: [121543] trunk
- Revision
- 121543
- Author
- [email protected]
- Date
- 2012-06-29 03:03:14 -0700 (Fri, 29 Jun 2012)
Log Message
[Qt] Don't add Qt module dependencies in features.prf
The required dependencies are already added in WebCore.pri.
Patch by Oswald Buddenhagen <[email protected]> on 2012-06-29
Reviewed by Tor Arne Vestbø.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121542 => 121543)
--- trunk/Source/WebCore/ChangeLog 2012-06-29 09:54:00 UTC (rev 121542)
+++ trunk/Source/WebCore/ChangeLog 2012-06-29 10:03:14 UTC (rev 121543)
@@ -1,3 +1,13 @@
+2012-06-29 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Don't add Qt module dependencies in features.prf
+
+ The required dependencies are already added in WebCore.pri.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebCore.pri:
+
2012-06-29 Taiju Tsuiki <[email protected]>
Web Inspector: Add FileSystemView
Modified: trunk/Source/WebCore/WebCore.pri (121542 => 121543)
--- trunk/Source/WebCore/WebCore.pri 2012-06-29 09:54:00 UTC (rev 121542)
+++ trunk/Source/WebCore/WebCore.pri 2012-06-29 10:03:14 UTC (rev 121543)
@@ -171,7 +171,7 @@
MOBILITY *= location
}
-contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
+contains(DEFINES, ENABLE_ORIENTATION_EVENTS=1)|contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
haveQt(5) {
QT += sensors
} else {
Modified: trunk/Tools/ChangeLog (121542 => 121543)
--- trunk/Tools/ChangeLog 2012-06-29 09:54:00 UTC (rev 121542)
+++ trunk/Tools/ChangeLog 2012-06-29 10:03:14 UTC (rev 121543)
@@ -1,3 +1,13 @@
+2012-06-29 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Don't add Qt module dependencies in features.prf
+
+ The required dependencies are already added in WebCore.pri.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-06-27 Oswald Buddenhagen <[email protected]>
[Qt] Use LIBS_PRIVATE instead of putting dependencies into LIBS
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121542 => 121543)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-29 09:54:00 UTC (rev 121542)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-06-29 10:03:14 UTC (rev 121543)
@@ -145,10 +145,6 @@
contains(MOBILITY_CONFIG, sensors) {
!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=1
!contains(DEFINES, ENABLE_DEVICE_ORIENTATION=.): DEFINES += ENABLE_DEVICE_ORIENTATION=1
-
- # FIXME: These should not be here, but in the target that needs them
- CONFIG *= mobility
- MOBILITY *= sensors
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
