1 files changed, 2 insertions, 7 deletions
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 1d2f88ec3..4b6e95bd9 100644
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -25,9 +25,6 @@ defineTest(detectFeatures) {
 
     # ------------- 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,9 +96,7 @@ defineTest(detectFeatures) {
     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
     haveQtModule(sensors): WEBKIT_CONFIG += orientation_events device_orientation
@@ -121,7 +116,7 @@ defineTest(detectFeatures) {
         } 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
     }