diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configure.pro | 4 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 1 | ||||
| -rw-r--r-- | tools/linguist/lupdate/java.cpp | 1 |
3 files changed, 4 insertions, 2 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 ecccfb4..c8e369e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2788,7 +2788,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"; } diff --git a/tools/linguist/lupdate/java.cpp b/tools/linguist/lupdate/java.cpp index 05b1987..3f532d5 100644 --- a/tools/linguist/lupdate/java.cpp +++ b/tools/linguist/lupdate/java.cpp @@ -631,7 +631,6 @@ bool loadJava(Translator &translator, const QString &filename, ConversionData &c yyFileName = filename; yyCurLineNo = 1; yyParenLineNo = 1; - yyCh = getChar(); parse(&translator); |