Merge branch 'stable' into dev

Conflicts:
	.qmake.conf

Change-Id: Ic3d3ef471f7b64dde6b7965d8514fc6916012c2f

4 files changed, 10 insertions, 18 deletions

diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro
index 2fa9086d9..366d0bd5a 100644
--- a/Tools/QtTestBrowser/QtTestBrowser.pro
+++ b/Tools/QtTestBrowser/QtTestBrowser.pro
@@ -48,7 +48,7 @@ macx:QT += xml
 
 have?(FONTCONFIG): PKGCONFIG += fontconfig
 
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
     QT += opengl
     DEFINES += QT_CONFIGURED_WITH_OPENGL
 }
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf
index ac4abeb93..9d88dff39 100644
--- a/Tools/qmake/mkspecs/features/configure.prf
+++ b/Tools/qmake/mkspecs/features/configure.prf
@@ -57,7 +57,7 @@ defineTest(runConfigure) {
     # to determine which pro-files to include. The remaining sanitazion
     # is done when finalizing configure.
 
-    !haveQtModule(widgets) {
+    !qtHaveModule(widgets) {
         CONFIGURE_WARNINGS += "Missing QtWidgets module, disabling WebKit1"
         WEBKIT_CONFIG -= build_webkit1
     }
@@ -89,7 +89,7 @@ defineTest(finalizeConfigure) {
     santizeFeatures()
 
     # Sanitize build options
-    !haveQtModule(testlib) {
+    !qtHaveModule(testlib) {
         CONFIGURE_WARNINGS += "Missing QtTest module, disabling DumpRenderTree, WebKitTestRunner and tests"
         WEBKIT_CONFIG -= build_drt build_wtr build_tests
     }
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 804d8cb57..66d3b5b6a 100644
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -30,12 +30,12 @@ defineTest(detectFeatures) {
     # Please note: static feature defaults go in features.pri
     #
 
-    haveQtModule(quick): WEBKIT_CONFIG += have_qtquick
+    qtHaveModule(quick): WEBKIT_CONFIG += have_qtquick
     else: CONFIGURE_WARNINGS += "QtQuick module not found, QML APIs will not be built"
 
-    haveQtModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
-    haveQtModule(widgets): WEBKIT_CONFIG += have_qstyle
-    haveQtModule(testlib): WEBKIT_CONFIG += have_qttestlib
+    qtHaveModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
+    qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle
+    qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib
 
     config_libxml2: WEBKIT_CONFIG += use_libxml2
     config_libxslt: WEBKIT_CONFIG += xslt
@@ -95,10 +95,10 @@ defineTest(detectFeatures) {
     enable?(css_filters):enable?(webgl): WEBKIT_CONFIG += css_shaders
 
     # Geolocation support if QtMobility exists
-    haveQtModule(location): WEBKIT_CONFIG += geolocation
+    qtHaveModule(location): WEBKIT_CONFIG += geolocation
 
     # Orientation support
-    haveQtModule(sensors): WEBKIT_CONFIG += orientation_events device_orientation
+    qtHaveModule(sensors): WEBKIT_CONFIG += orientation_events device_orientation
 
     # HTML5 Media Support for non-Mac builds
     !mac {
@@ -111,7 +111,7 @@ defineTest(detectFeatures) {
         }
     }
 
-    !enable?(video):haveQtModule(multimediawidgets) {
+    !enable?(video):qtHaveModule(multimediawidgets) {
         WEBKIT_CONFIG += video use_qt_multimedia
     }
 
diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
index b8715fef9..922ac3236 100644
--- a/Tools/qmake/mkspecs/features/functions.prf
+++ b/Tools/qmake/mkspecs/features/functions.prf
@@ -195,14 +195,6 @@ defineTest(haveQt) {
     return(true)
 }
 
-defineTest(haveQtModule) {
-    unset(module)
-    module = $$1
-
-    haveQt(5):!isEmpty(QT.$${module}.name): return(true)
-    return(false)
-}
-
 defineTest(programExistsInPath) {
     win32: program = $${1}.exe
     else: program = $$1