diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 16:57:34 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:04:02 +0200 |
commit | c51d26b6ec7869641441d01597c3e7acc643f93f (patch) | |
tree | 69ee279e12be73ae385e087c9d89ce7bc8480446 /mkspecs/features/qt_module_pris.prf | |
parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
parent | 967c18d29694fdeab858691a80cb8400fd02ec33 (diff) |
Merge branch 'release' into old/5.0old/5.0
Conflicts:
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Id635e0c27df5d8e3852d12bd6433c6463bf4eadc
Diffstat (limited to 'mkspecs/features/qt_module_pris.prf')
-rw-r--r-- | mkspecs/features/qt_module_pris.prf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index b74e5dd73f..03863e0648 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -11,7 +11,7 @@ load(qt_build_paths) MODULE_FWD_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_lib_$${MODULE}.pri -prefix_build: \ +force_independent: \ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri else: \ MODULE_PRI = $$MODULE_FWD_PRI @@ -71,11 +71,11 @@ else: \ $$module_config \ "QT.$${MODULE}.DEFINES = $$MODULE_DEFINES" \ # assume sufficient quoting "" \ - "QT_CONFIG += $$MODULE" # this is obsolete, but some code still depends on it + "QT_MODULES += $$MODULE" write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") MODULE_PRI_FILES = $$MODULE_PRI - prefix_build { + force_independent { # Create a forwarding module .pri file MODULE_FWD_PRI_CONT = \ @@ -113,7 +113,7 @@ else: \ includes private_includes bins libs libexecs plugins imports qml \ rpath_link rpath_link_private \ )):defined(QT.$${MODULE}.$$var, var):cache(QT.$${MODULE}.$$var, transient) - cache(QT_CONFIG, transient) + cache(QT_MODULES, transient) } # !build_pass |