summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-09 18:41:21 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-09 22:13:06 +0100
commitcb03577711a7dddd6444c0f6114fbf3785552353 (patch)
tree25c5bf17d1fe1389cb80c4ded1b39e3d5c0b29e9 /tools/configure
parent2091d4c33a0f20e44f64ecf9953bb7725ceed287 (diff)
properly enable stl via qmake instead of hacking compiler flags
Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configure.pro3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index 8819fef576..6e0571c5b8 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -1,13 +1,12 @@
TARGET = configure
DESTDIR = $$PWD/../.. # build directly in source dir
-CONFIG += console flat
+CONFIG += console flat stl
CONFIG -= moc qt
DEFINES = UNICODE QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_NO_THREAD QT_NO_QOBJECT QT_NO_GEOM_VARIANT _CRT_SECURE_NO_DEPRECATE
DEFINES += QT_BOOTSTRAPPED
win32 : LIBS += -lole32 -ladvapi32
-win32-msvc.net | win32-msvc2* : QMAKE_CXXFLAGS += /EHsc
win32-g++* : LIBS += -luuid
win32-msvc* {