diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2009-08-10 07:19:20 (GMT) |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2009-08-10 07:19:20 (GMT) |
| commit | 6cc14b9bd84de30471db40f73b119ba33356a6ba (patch) | |
| tree | 4cf9cb9b3aee37021654335658458c25ea7602bf /mkspecs/features | |
| parent | d16ae8ffa8432541ddf481d4166a04e9cfa4e5b4 (diff) | |
| download | Qt-6cc14b9bd84de30471db40f73b119ba33356a6ba.zip Qt-6cc14b9bd84de30471db40f73b119ba33356a6ba.tar.gz Qt-6cc14b9bd84de30471db40f73b119ba33356a6ba.tar.bz2 | |
In a .pro file the include() function does not warn if specified file
can not be found change that behavior to warn by default.
Currently the default behavior of include() in a .pro file is not to
warn if the supplied file argument can not be found which can lead to
hard to find build errors. The include() will now,by default, warn if
the specified file can not be found.
If a warning is not required because the included file is optional then
example use in the .pro file:
include(SomePriFile.pri", "", true)
Task-number:259398
Reviewed-by:Marius Storm-Olsen
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_config.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 779c2e5..0a2d985 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -4,7 +4,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { else:exists($$_QMAKE_CACHE_):infile($$_QMAKE_CACHE_, QT_BUILD_TREE):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)/mkspecs/qconfig.pri else:exists($$[QT_INSTALL_DATA]/mkspecs/qconfig.pri):QMAKE_QT_CONFIG = $$[QT_INSTALL_DATA]/mkspecs/qconfig.pri } -!exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG) { +!exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG, "", true) { debug(1, "Cannot load qconfig.pri!") } else { debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") |