1 files changed, 33 insertions, 6 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf
index dc7a5da30e..99ba0c6877 100644
--- a/mkspecs/features/qt_helper_lib.prf
+++ b/mkspecs/features/qt_helper_lib.prf
@@ -15,18 +15,45 @@ TEMPLATE = lib
 CONFIG -= qt
 QT =  # In case qt is re-added.
 
+INCLUDEPATH += $$MODULE_INCLUDEPATH
+DEFINES += $$MODULE_DEFINES
+
 CONFIG -= warning_clean  # Don't presume 3rd party code to be clean
 load(qt_common)
 
-contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
-contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
-contains(QT_CONFIG, build_all): CONFIG += build_all
+qtConfig(debug_and_release): CONFIG += debug_and_release
+qtConfig(build_all): CONFIG += build_all
 
 DESTDIR = $$MODULE_BASE_OUTDIR/lib
 DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
 
+THE_TARGET = $$qt5LibraryTarget($$TARGET)
+
+!build_pass {
+    MODULE = $$replace(TARGET, ^qt, )
+    MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_ext_$${MODULE}.pri
+    ucmodule = $$upper($$MODULE)
+
+    MODULE_PRI_CONT = \
+        "QMAKE_INCDIR_$${ucmodule} = $$val_escape(MODULE_INCLUDEPATH)" \
+        "QMAKE_DEFINES_$${ucmodule} = $$val_escape(MODULE_DEFINES)"
+    debug_and_release {
+        win32: MODULE_DEBUG_LIBS = -L$$DESTDIR -l$${TARGET}d
+        darwin: MODULE_DEBUG_LIBS = -L$$DESTDIR -l$${TARGET}_debug
+        MODULE_RELEASE_LIBS = -L$$DESTDIR -l$$TARGET
+        MODULE_PRI_CONT += \
+            "QMAKE_LIBS_$${ucmodule}_DEBUG = $$val_escape(MODULE_DEBUG_LIBS)" \
+            "QMAKE_LIBS_$${ucmodule}_RELEASE = $$val_escape(MODULE_RELEASE_LIBS)"
+    } else {
+        MODULE_LIBS = -L$$DESTDIR -l$$THE_TARGET
+        MODULE_PRI_CONT += \
+            "QMAKE_LIBS_$${ucmodule} = $$val_escape(MODULE_LIBS)"
+    }
+    write_file($$MODULE_PRI, MODULE_PRI_CONT)|error()
+}
+
+TARGET = $$THE_TARGET
+
 # In static builds of Qt, convenience libraries must be installed,
 # as in this case they are not linked to the final library/plugin.
-installed|if(!not_installed:contains(QT_CONFIG, static)): load(qt_installs)
-
-TARGET = $$qt5LibraryTarget($$TARGET)
+installed|if(!not_installed:qtConfig(static)): load(qt_installs)