Title: [130758] trunk/Tools
- Revision
- 130758
- Author
- hausm...@webkit.org
- Date
- 2012-10-09 07:02:52 -0700 (Tue, 09 Oct 2012)
Log Message
[Qt] Clean up Qt module detection
Reviewed by Tor Arne Vestbø.
Replace the use of MOBILITY_CONFIG (not supported anymore) with modern use of haveQtModule.
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (130757 => 130758)
--- trunk/Tools/ChangeLog 2012-10-09 13:45:52 UTC (rev 130757)
+++ trunk/Tools/ChangeLog 2012-10-09 14:02:52 UTC (rev 130758)
@@ -1,3 +1,13 @@
+2012-10-09 Simon Hausmann <simon.hausm...@digia.com>
+
+ [Qt] Clean up Qt module detection
+
+ Reviewed by Tor Arne Vestbø.
+
+ Replace the use of MOBILITY_CONFIG (not supported anymore) with modern use of haveQtModule.
+
+ * qmake/mkspecs/features/features.prf:
+
2012-10-09 Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
[GTK] Respect WEBKITOUTPUTDIR in run-with-jhbuild.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (130757 => 130758)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-10-09 13:45:52 UTC (rev 130757)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-10-09 14:02:52 UTC (rev 130758)
@@ -25,9 +25,6 @@
# ------------- Prepare for feature detection -------------
- # Load mobilityconfig if mobility is available
- load(mobilityconfig, true)
-
# ---------- Dynamically detect optional features -------------
#
# Please note: static feature defaults go in features.pri
@@ -99,8 +96,7 @@
enable?(css_filters):enable?(webgl): WEBKIT_CONFIG += css_shaders
# Geolocation support if QtMobility exists
- contains(MOBILITY_CONFIG, location)|contains(QT_CONFIG, location) {
- WEBKIT_CONFIG += geolocation
+ haveQtModule(location): WEBKIT_CONFIG += geolocation
}
# Orientation support
@@ -121,7 +117,7 @@
} else {
CONFIGURE_WARNINGS += "Missing GLib/Gio/GStreamer, disabling media element support"
}
- } else: contains(MOBILITY_CONFIG, multimedia) {
+ } else: haveQtModule(multimediawidgets) {
WEBKIT_CONFIG += video use_qt_multimedia
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
