diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-05 12:15:50 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-08 18:54:46 +0100 |
commit | 5f9d126ca8ae4678ead6a70bccb459413e4c86cc (patch) | |
tree | 2b709d262b0e8a31a6ba87fde76cca7b567fd59e /tests/auto/tools/qmake | |
parent | 4035375c57bf26b49d819d931b08fa69d818acab (diff) |
remove strange .qmake.cache hacks
they are obsolete (qmake knows the qt build configuration anyway), and
messing with QTDIR is a recipe for disaster.
Change-Id: Ib3594f38ec3192a5f70771f8bc5d8fd435bbbd15
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tests/auto/tools/qmake')
5 files changed, 0 insertions, 26 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 247bd27096..c5ffa40742 100644 --- a/tests/auto/tools/qmake/testdata/one_space/one_space.pro +++ b/tests/auto/tools/qmake/testdata/one_space/one_space.pro @@ -3,8 +3,3 @@ CONFIG += qt warn_on SOURCES = main.cpp TARGET = "one space" DESTDIR = ./ - -infile($(QTDIR)/.qmake.cache, CONFIG, debug):CONFIG += debug -infile($(QTDIR)/.qmake.cache, CONFIG, release):CONFIG += release - - 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 a8c4ad613d..94af3cd3ba 100644 --- a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro +++ b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro @@ -6,8 +6,3 @@ SOURCES = test_file.cpp \ RESOURCES = test.qrc TARGET = simple_app DESTDIR = ./ - -infile($(QTDIR)/.qmake.cache, CONFIG, debug):CONFIG += debug -infile($(QTDIR)/.qmake.cache, CONFIG, release):CONFIG += release - - 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 9af38ecce6..09c18d1631 100644 --- a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro +++ b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro @@ -12,8 +12,3 @@ MOC_DIR = tmp OBJECTS_DIR = tmp TARGET = simple_dll DESTDIR = ./ - -infile($(QTDIR)/.qmake.cache, CONFIG, debug):CONFIG += debug -infile($(QTDIR)/.qmake.cache, CONFIG, release):CONFIG += release - - 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 f496d5bb8e..4191f142d8 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 @@ -5,8 +5,3 @@ SOURCES = test_file.cpp \ main.cpp TARGET = simple_app DESTDIR = ./ - -infile($(QTDIR)/.qmake.cache, CONFIG, debug):CONFIG += debug -infile($(QTDIR)/.qmake.cache, CONFIG, release):CONFIG += release - - 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 a54a07a0e7..09c18d1631 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,4 +1,3 @@ -include($(QTDIR)/.qmake.cache) TEMPLATE = lib CONFIG += qt warn_on dll @@ -13,8 +12,3 @@ MOC_DIR = tmp OBJECTS_DIR = tmp TARGET = simple_dll DESTDIR = ./ - -infile($(QTDIR)/.qmake.cache, CONFIG, debug):CONFIG += debug -infile($(QTDIR)/.qmake.cache, CONFIG, release):CONFIG += release - - |