diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-04 17:10:11 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:08 +0200 |
| commit | 1ee462604b1ca981351b663c28d45472fcf7c6f2 (patch) | |
| tree | 6f9eb0a417d30555aa8e5b875defa6fa35348e4f /mkspecs/features/qt_module_config.prf | |
| parent | b3a497d78112c315a08b5c31fb0fcf59481df42c (diff) | |
| download | qtbase-1ee462604b1ca981351b663c28d45472fcf7c6f2.tar.gz | |
fix misnomer: qt_module.prf => qt_build_config.prf
qt_module suggests to be congruent to qt_plugin.
Change-Id: I629530bcbe2ba6c0adbdc11a275119c8aff0c953
Diffstat (limited to 'mkspecs/features/qt_module_config.prf')
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 3d44928484..d53862969d 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -1,12 +1,12 @@ !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.") + warning("You should probably load(qt_build_config) first in $$QMAKE_ACTUAL_PRO_FILE for $$TARGET, as it also load()s qt_module_config.") message("Not doing so may lead to qt_module_config.prf overriding compiler/linker options in your .pro file.") message("Ignore this warning with CONFIG+=no_qt_module_warning if you know what you are doing.") unset(QMAKE_ACTUAL_PRO_FILE) } -load(qt_module) # loads qmodule.pri if hasn't been loaded already +load(qt_build_config) # loads qmodule.pri if hasn't been loaded already isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") |