summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-09-15 23:21:11 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-09-15 23:21:11 (GMT)
commitd3b03a7d6c4ad023572d7099ee9f9ec3f0711d04 (patch)
tree5326031090ee5921eaf5c3259153194ddc352afc /tools/configure
parent45c13a0064281d0e2b9a10c7dfb0cef7f3b6720f (diff)
parent669afa2337ad5791502fe3af2e3de648cb60ea9b (diff)
downloadQt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.zip
Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.tar.gz
Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: configure.exe
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configure.pro4
-rw-r--r--tools/configure/configureapp.cpp1
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index 06e9fe0..243183c 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -12,9 +12,13 @@ win32-g++ : LIBS += -luuid
win32-msvc* {
QMAKE_CFLAGS_RELEASE -= -MD
+ QMAKE_CFLAGS_RELEASE += -MT
QMAKE_CFLAGS_DEBUG -= -MDd
+ QMAKE_CFLAGS_DEBUG += -MTd
QMAKE_CXXFLAGS_RELEASE -= -MD
+ QMAKE_CXXFLAGS_RELEASE += -MT
QMAKE_CXXFLAGS_DEBUG -= -MDd
+ QMAKE_CXXFLAGS_DEBUG += -MTd
}
PRECOMPILED_HEADER = configure_pch.h
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 2ccff9b..aab05b1 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2798,7 +2798,6 @@ static void applyTemporarySymbianFlags(QStringList &qconfigList)
// This is removed because it uses UNIX signals which are not implemented yet
qconfigList += "QT_NO_CRASHHANDLER";
qconfigList += "QT_NO_PRINTER";
- qconfigList += "QT_NO_CURSOR";
qconfigList += "QT_NO_SYSTEMTRAYICON";
}