summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-08-10 07:19:20 (GMT)
committerKeith Isdale <keith.isdale@nokia.com>2009-08-10 07:19:20 (GMT)
commit6cc14b9bd84de30471db40f73b119ba33356a6ba (patch)
tree4cf9cb9b3aee37021654335658458c25ea7602bf /tests
parentd16ae8ffa8432541ddf481d4166a04e9cfa4e5b4 (diff)
downloadQt-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 'tests')
-rw-r--r--tests/auto/qaccessibility_mac/qaccessibility_mac.pro2
-rw-r--r--tests/auto/qmake/testdata/functions/functions.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro
index b32a7e5..47f72d1 100644
--- a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro
+++ b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro
@@ -11,7 +11,7 @@ requires(mac)
# builds (where QTDIR points to the build directory).
# autotest + shadow build is not supported :)
exists($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) {
- include($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri)
+ include($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri, "", true)
INCLUDEPATH += $$(QTDIR)/tools/designer/src/uitools
SOURCES += $$(QTDIR)/tools/designer/src/uitools/quiloader.cpp
HEADERS += $$(QTDIR)/tools/designer/src/uitools/quiloader.h
diff --git a/tests/auto/qmake/testdata/functions/functions.pro b/tests/auto/qmake/testdata/functions/functions.pro
index 9ed92f96..5e089e4 100644
--- a/tests/auto/qmake/testdata/functions/functions.pro
+++ b/tests/auto/qmake/testdata/functions/functions.pro
@@ -46,7 +46,7 @@ isEmpty( CONFIG ) {
}
#include
-include( infiletest.pro )
+include( infiletest.pro, "", true )
!contains( DEFINES, QT_DLL ) {
message( "FAILED: include function: $$DEFINES" )
}