diff options
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/qt_module.prf | 4 | ||||
-rw-r--r-- | mkspecs/features/qt_module_pris.prf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 876e5130c6..3cacc8dfde 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -57,9 +57,9 @@ ucmodule = $$upper($$MODULE) isEmpty(MODULE_INCNAME): MODULE_INCNAME = $$TARGET internal_module: \ - MODULE_DEPENDS = $$replace(QT, -private$, _private) + MODULE_DEPENDS += $$replace(QT, -private$, _private) else: \ - MODULE_DEPENDS = $$replace(QT, -private$, ) + MODULE_DEPENDS += $$replace(QT, -private$, ) MODULE_DEPENDS = $$unique(MODULE_DEPENDS) contains(MODULE_DEPENDS, $$MODULE): \ error("$$TARGET depends on itself.") diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index 7a6cc56754..1cf2afcac6 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -154,8 +154,8 @@ defineReplace(qtExportLibsForModule) { $$qtGetExportsForModule($$MODULE_ID) \ "QT_CONFIG +=$$join(QT.$${MODULE_ID}.QT_CONFIG, " ", " ")" \ "" \ - "QT_MODULES += $$MODULE" \ - "$$MODULE_PRI_EXTRA_CONTENT" + "QT_MODULES += $$MODULE" + MODULE_PRI_CONT += $$MODULE_PRI_EXTRA_CONTENT write_file($$MODULE_PRI, MODULE_PRI_CONT)|error() !internal_module:!no_private_module { module_build_type += internal_module |