diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-09 17:41:21 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 10:56:39 (GMT) |
| commit | 7d3c9d48c8d97d344b5174bfedbe357f7f5c138e (patch) | |
| tree | 555b0142e34e692724bf21eb40293fb732a08fce | |
| parent | c251bc2a259f6ac2688f669bffd768fc546a45a1 (diff) | |
| download | Qt-7d3c9d48c8d97d344b5174bfedbe357f7f5c138e.zip Qt-7d3c9d48c8d97d344b5174bfedbe357f7f5c138e.tar.gz Qt-7d3c9d48c8d97d344b5174bfedbe357f7f5c138e.tar.bz2 | |
properly enable stl via qmake instead of hacking compiler flags
Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit cb03577711a7dddd6444c0f6114fbf3785552353)
| -rw-r--r-- | tools/configure/configure.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index 6c93fe7..ed31a43 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* { |