diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-13 20:14:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-13 20:14:59 (GMT) |
| commit | 444fa479484f80cbd5de3e9c5fa2b2e4082643dd (patch) | |
| tree | b347bf94244c52cab12515d6edacd01c7fe13478 /mkspecs/win32-msvc2005/qmake.conf | |
| parent | df28c1203e12c572f795b8d114254a8e5a6619e8 (diff) | |
| parent | 1404c38ad9d1bf5412ca49da7b2b50295d0ce0fb (diff) | |
| download | Qt-444fa479484f80cbd5de3e9c5fa2b2e4082643dd.zip Qt-444fa479484f80cbd5de3e9c5fa2b2e4082643dd.tar.gz Qt-444fa479484f80cbd5de3e9c5fa2b2e4082643dd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits)
fix macx not having UNICODE in DEFINES any more
doc: Fixed several qdoc warnings.
Fix an Assert in QTextTable
doc: Fixed several qdoc warnings.
QSslSocket: Improve error handling
qdoc: Fixed several <div> elements that had the "/>" ending.
QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()
qdoc: Fixed breadcrumbs for QML examples.
remove redundand translations project files
make projects lupdate-friendly
Timing fix for slow devices.
QNAM: Add future enum attribute for Zerocopy QNAM
fixed built-in jpeg and tiff in configure.exe, QTBUG-12093
fix indentation
fix build for -no-qt3support
Compile fix for bearermonitor example
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
...
Diffstat (limited to 'mkspecs/win32-msvc2005/qmake.conf')
| -rw-r--r-- | mkspecs/win32-msvc2005/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index 0406fd0..a5999cc 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -16,7 +16,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t- +QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 -MD |