summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-12-14 19:17:20 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-17 14:08:17 +0100
commit09331062bb705e5778f346b701a38454905ec1e0 (patch)
treeb8d40c24d41a28ce6278ab9e4cbcfdc98b78d030 /tests/auto/tools/qmake
parentdcfa8926ff4b4db2290d819420c29480dab611b1 (diff)
remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: Ic00e0ba496d698ed9659c476f2ca99fc0f86a093 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/tools/qmake')
-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
7 files changed, 3 insertions, 7 deletions
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