Title: [115821] trunk/Tools
- Revision
- 115821
- Author
- [email protected]
- Date
- 2012-05-02 06:19:51 -0700 (Wed, 02 May 2012)
Log Message
[Qt] Enable device orientation/motion with Qt 5
Reviewed by Tor Arne Vestbø.
Enable device orientation/motion features with Qt 5 if Qt Sensors is available.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (115820 => 115821)
--- trunk/Tools/ChangeLog 2012-05-02 13:17:17 UTC (rev 115820)
+++ trunk/Tools/ChangeLog 2012-05-02 13:19:51 UTC (rev 115821)
@@ -1,3 +1,13 @@
+2012-05-02 Simon Hausmann <[email protected]>
+
+ [Qt] Enable device orientation/motion with Qt 5
+
+ Reviewed by Tor Arne Vestbø.
+
+ Enable device orientation/motion features with Qt 5 if Qt Sensors is available.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-05-01 Raphael Kubo da Costa <[email protected]>
webkitpy: Remove unused platform imports.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (115820 => 115821)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-02 13:17:17 UTC (rev 115820)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-02 13:19:51 UTC (rev 115821)
@@ -199,12 +199,20 @@
}
}
-# orientation support if QtMobility exists
-contains(MOBILITY_CONFIG, sensors) {
- !contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=1
- !contains(DEFINES, ENABLE_DEVICE_ORIENTATION=.): DEFINES += ENABLE_DEVICE_ORIENTATION=1
- CONFIG *= mobility
- MOBILITY *= sensors
+# orientation support
+haveQt(5) {
+ !isEmpty(QT.sensors.name) {
+ !contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=1
+ !contains(DEFINES, ENABLE_DEVICE_ORIENTATION=.): DEFINES += ENABLE_DEVICE_ORIENTATION=1
+ }
+} else {
+ # Qt 4 with Qt Mobility
+ contains(MOBILITY_CONFIG, sensors) {
+ !contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=1
+ !contains(DEFINES, ENABLE_DEVICE_ORIENTATION=.): DEFINES += ENABLE_DEVICE_ORIENTATION=1
+ CONFIG *= mobility
+ MOBILITY *= sensors
+ }
}
!contains(DEFINES, ENABLE_TOUCH_EVENTS=.): DEFINES += ENABLE_TOUCH_EVENTS=1
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
