summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-08-19 13:33:30 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-08-19 13:41:51 (GMT)
commitdc6c7b7b2fa5a1df1aa26cb170679a5f008fd20a (patch)
tree43cb67c36cc5fb08218ece56eba151626748b48f /tools/configure
parent05b30326aa7c862cb8dd25e202267eb1e3c378a6 (diff)
downloadQt-dc6c7b7b2fa5a1df1aa26cb170679a5f008fd20a.zip
Qt-dc6c7b7b2fa5a1df1aa26cb170679a5f008fd20a.tar.gz
Qt-dc6c7b7b2fa5a1df1aa26cb170679a5f008fd20a.tar.bz2
Remove win32-mwc support, as per suggested in review comment by Espen.
Reviewed-by: axis
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configure.pro5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index c87fd11..06e9fe0 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -6,10 +6,7 @@ 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_BUILD_QMAKE QT_NO_THREAD QT_NO_QOBJECT _CRT_SECURE_NO_DEPRECATE
-win32 : !win32-mwc : LIBS += -lole32 -ladvapi32
-win32-mwc {
- LIBS += -ladvapi32.lib -luuid.lib
-}
+win32 : LIBS += -lole32 -ladvapi32
win32-msvc.net | win32-msvc2* : QMAKE_CXXFLAGS += /EHsc
win32-g++ : LIBS += -luuid