summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro2
-rw-r--r--tests/auto/tools/qmake/testdata/one_space/one_space.pro1
-rw-r--r--tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro1
-rw-r--r--tests/auto/tools/qmake/testdata/simple_app/simple_app.pro1
-rw-r--r--tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro2
-rw-r--r--tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro2
-rw-r--r--tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro1
-rw-r--r--tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro2
8 files changed, 3 insertions, 9 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
index 0897a6b3ba..8dd8d930c1 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
@@ -4,8 +4,6 @@ TARGET = tst_qmimedatabase-xml
QT = core testlib concurrent
-CONFIG += depend_includepath
-
SOURCES += tst_qmimedatabase-xml.cpp
HEADERS += ../tst_qmimedatabase.h
diff --git a/tests/auto/tools/qmake/testdata/one_space/one_space.pro b/tests/auto/tools/qmake/testdata/one_space/one_space.pro
index 651035df69..5f48aef119 100644
--- a/tests/auto/tools/qmake/testdata/one_space/one_space.pro
+++ b/tests/auto/tools/qmake/testdata/one_space/one_space.pro
@@ -1,5 +1,4 @@
TEMPLATE = app
-CONFIG += qt warn_on
SOURCES = main.cpp
TARGET = "one space"
DESTDIR = ./
diff --git a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro
index c3dd252d25..139c4153f5 100644
--- a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro
+++ b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro
@@ -1,5 +1,4 @@
TEMPLATE = app
-CONFIG += qt warn_on
TARGET = quotedfilenames
SOURCES = main.cpp
diff --git a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
index a677388fae..3d30e25b68 100644
--- a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
+++ b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
@@ -1,5 +1,4 @@
TEMPLATE = app
-CONFIG += qt warn_on
HEADERS = test_file.h
SOURCES = test_file.cpp \
main.cpp
diff --git a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro
index f74067e2c9..4b7b3f31ce 100644
--- a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro
+++ b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on dll
+CONFIG += dll
win32:DEFINES += SIMPLEDLL_MAKEDLL
diff --git a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro
index bc239ad1a8..c04ed05ff3 100644
--- a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro
+++ b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on release staticlib
+CONFIG += release staticlib
CONFIG -= dll
HEADERS = simple.h
diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro
index df8e81aa7b..db1d57b502 100644
--- a/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro
@@ -1,5 +1,4 @@
TEMPLATE = app
-CONFIG += qt warn_on
HEADERS = test_file.h
SOURCES = test_file.cpp \
main.cpp
diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
index f74067e2c9..4b7b3f31ce 100644
--- a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on dll
+CONFIG += dll
win32:DEFINES += SIMPLEDLL_MAKEDLL