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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/assistant/compat/lib/lib.pro | 2 | ||||
| -rw-r--r-- | tools/designer/src/components/lib/lib.pro | 2 | ||||
| -rw-r--r-- | tools/designer/src/lib/lib.pro | 2 | ||||
| -rw-r--r-- | tools/designer/src/uitools/uitools.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro index d4b5a47..e50d470 100644 --- a/tools/assistant/compat/lib/lib.pro +++ b/tools/assistant/compat/lib/lib.pro @@ -32,7 +32,7 @@ contains(CONFIG, static) { #load up the headers info CONFIG += qt_install_headers HEADERS_PRI = $$QT_BUILD_TREE/include/QtAssistant/headers.pri -include($$HEADERS_PRI)|clear(HEADERS_PRI) +include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) #mac frameworks mac:!static:contains(QT_CONFIG, qt_framework) { diff --git a/tools/designer/src/components/lib/lib.pro b/tools/designer/src/components/lib/lib.pro index 4515b66..92cf387 100644 --- a/tools/designer/src/components/lib/lib.pro +++ b/tools/designer/src/components/lib/lib.pro @@ -24,7 +24,7 @@ QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. #load up the headers info CONFIG += qt_install_headers HEADERS_PRI = $$QT_BUILD_TREE/include/QtDesigner/headers.pri -include($$HEADERS_PRI)|clear(HEADERS_PRI) +include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) #mac frameworks mac:!static:contains(QT_CONFIG, qt_framework) { diff --git a/tools/designer/src/lib/lib.pro b/tools/designer/src/lib/lib.pro index e0f2f23..495976d 100644 --- a/tools/designer/src/lib/lib.pro +++ b/tools/designer/src/lib/lib.pro @@ -34,7 +34,7 @@ QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. #load up the headers info CONFIG += qt_install_headers HEADERS_PRI = $$QT_BUILD_TREE/include/QtDesigner/headers.pri -include($$HEADERS_PRI)|clear(HEADERS_PRI) +include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) #mac frameworks mac:CONFIG += explicitlib diff --git a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro index a20abf0..34e4877 100644 --- a/tools/designer/src/uitools/uitools.pro +++ b/tools/designer/src/uitools/uitools.pro @@ -22,7 +22,7 @@ include(../lib/uilib/uilib.pri) HEADERS += quiloader.h SOURCES += quiloader.cpp -include($$QT_BUILD_TREE/include/QtUiTools/headers.pri) +include($$QT_BUILD_TREE/include/QtUiTools/headers.pri, "", true) quitools_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES quitools_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools INSTALLS += quitools_headers |