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>
This commit is contained in:
parent
4035375c57
commit
5f9d126ca8
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user