Title: [121846] trunk/Tools
- Revision
- 121846
- Author
- [email protected]
- Date
- 2012-07-04 06:44:15 -0700 (Wed, 04 Jul 2012)
Log Message
[Qt] Fix haveQtModule() check
Without {} brackets we were pulling out the value of the module.name variable.
Reviewed by Jocelyn Turcotte.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121845 => 121846)
--- trunk/Tools/ChangeLog 2012-07-04 13:41:19 UTC (rev 121845)
+++ trunk/Tools/ChangeLog 2012-07-04 13:44:15 UTC (rev 121846)
@@ -1,3 +1,13 @@
+2012-07-04 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Fix haveQtModule() check
+
+ Without {} brackets we were pulling out the value of the module.name variable.
+
+ Reviewed by Jocelyn Turcotte.
+
+ * qmake/mkspecs/features/functions.prf:
+
2012-07-04 Sergio Villar Senin <[email protected]>
[WK2] [GTK] WK2 testing bot unable to find the InjectedBundle library
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (121845 => 121846)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-07-04 13:41:19 UTC (rev 121845)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-07-04 13:44:15 UTC (rev 121846)
@@ -207,8 +207,9 @@
defineTest(haveQtModule) {
unset(module)
module = $$1
- haveQt(4):contains(QT_CONFIG, $$module): return(true)
- haveQt(5):!isEmpty(QT.$$module.name): return(true)
+
+ haveQt(4):contains(QT_CONFIG, $${module}): return(true)
+ haveQt(5):!isEmpty(QT.$${module}.name): return(true)
return(false)
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
