Title: [121847] trunk/Tools
- Revision
- 121847
- Author
- ves...@webkit.org
- Date
- 2012-07-04 06:48:44 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Use haveQtModule() in project files instead of manual checks
Reviewed by Jocelyn Turcotte.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121846 => 121847)
--- trunk/Tools/ChangeLog 2012-07-04 13:44:15 UTC (rev 121846)
+++ trunk/Tools/ChangeLog 2012-07-04 13:48:44 UTC (rev 121847)
@@ -1,5 +1,14 @@
2012-07-04 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+ [Qt] Use haveQtModule() in project files instead of manual checks
+
+ Reviewed by Jocelyn Turcotte.
+
+ * qmake/mkspecs/features/default_pre.prf:
+ * qmake/mkspecs/features/features.prf:
+
+2012-07-04 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
[Qt] Fix haveQtModule() check
Without {} brackets we were pulling out the value of the module.name variable.
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (121846 => 121847)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-04 13:44:15 UTC (rev 121846)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-07-04 13:48:44 UTC (rev 121847)
@@ -107,7 +107,7 @@
}
haveQt(5): {
- isEmpty(QT.widgets.name)|isEmpty(QT.printsupport.name) {
+ !haveQtModule(widgets)|!haveQtModule(printsupport) {
root_project_file: message("WebKit1 requires the QtWidgets and QtPrintSupport modules. Disabling WebKit1.")
CONFIG += no_webkit1
}
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121846 => 121847)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-04 13:44:15 UTC (rev 121846)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-04 13:48:44 UTC (rev 121847)
@@ -105,7 +105,7 @@
}
# QStyle detection
-haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += HAVE_QSTYLE=1
+haveQt(4)|haveQtModule(widgets): DEFINES += HAVE_QSTYLE=1
# WebGL support
!contains(DEFINES, ENABLE_WEBGL=.) {
@@ -129,7 +129,7 @@
# orientation support
haveQt(5) {
- !isEmpty(QT.sensors.name) {
+ haveQtModule(sensors) {
!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=1
!contains(DEFINES, ENABLE_DEVICE_ORIENTATION=.): DEFINES += ENABLE_DEVICE_ORIENTATION=1
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
