3 files changed, 34 insertions, 1 deletions
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf
new file mode 100644
index 0000000000..56059e13cf
--- /dev/null
+++ b/mkspecs/features/device_config.prf
@@ -0,0 +1,27 @@
+# Load generated qdevice.pri
+exists($$_QMAKE_CACHE_) {
+    # set in default_pre, so it's the first place to check for qdevice.pri
+    DIR = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
+    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
+}
+
+isEmpty(DEVICE_PRI) {
+    # OUTDIR environ is set by configure (arch detection) and compile.test
+    DIR = $$(OUTDIR)
+    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
+}
+
+isEmpty(DEVICE_PRI) {
+    DIR = $$[QT_HOST_DATA]
+    !isEmpty(DIR):DEVICE_PRI = $$DIR/mkspecs/qdevice.pri
+}
+
+isEmpty(DEVICE_PRI) {
+    error(Could not locate qdevice.pri)
+}
+
+exists($$DEVICE_PRI):include($$DEVICE_PRI)
+
+unset(DEVICE_PRI)
+unset(DIR)
+
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 474a414003..ee1647f481 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -180,7 +180,13 @@ defineTest(qtPrepareTool) {
         } else {
             $$1 = $$eval($$1).exe
         }
+    } else:contains(QMAKE_HOST.os, Darwin) {
+        BUNDLENAME = $$eval($$1).app/Contents/MacOS/$$2
+        exists($$BUNDLENAME) {
+            $$1 = $$BUNDLENAME
+        }
     }
+
     export($$1)
 }
 
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index cae5f47387..75156a1f44 100644
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -42,7 +42,7 @@ CONFIG          -= fix_output_dirs
 win32|mac:!macx-xcode:CONFIG += debug_and_release
 linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 
-CONFIG += create_cmake
+!isEmpty(MODULE):CONFIG += create_cmake
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions