From b3a497d78112c315a08b5c31fb0fcf59481df42c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 13 Jun 2012 14:36:32 +0200 Subject: fix regexp in qmodule.pri inclusion check this also allows us removing the redundant flag variable Change-Id: If26d22280ce7bc2ef3514c7c11ce7cd9baec1293 --- mkspecs/features/qt_module.prf | 2 -- mkspecs/features/qt_module_config.prf | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 29b088bdc9..3f48a20a56 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -3,11 +3,9 @@ !exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) { error("Cannot load qmodule.pri!") } else { - QMAKE_QT_MODULE_PRI_LOADED = 1 debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") } } else { - QMAKE_QT_MODULE_PRI_LOADED = 1 # covers 'preloading' from .qmake.cache debug(1, "Not loading qmodule.pri twice") } diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 5e567143fe..3d44928484 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -1,4 +1,4 @@ -!no_qt_module_warning:if(!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\\\.pri)|isEmpty(QMAKE_QT_MODULE_PRI_LOADED)) { +!no_qt_module_warning:!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) { QMAKE_ACTUAL_PRO_FILE = $$basename(_PRO_FILE_) isEmpty(QMAKE_ACTUAL_PRO_FILE): QMAKE_ACTUAL_PRO_FILE=.pro warning("You should probably load(qt_module) first in $$QMAKE_ACTUAL_PRO_FILE for $$TARGET, as it also load()s qt_module_config.") -- cgit v1.2.3