diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 07:47:06 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 07:47:06 (GMT) |
| commit | 9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3 (patch) | |
| tree | ec1eb5ec4225b596dca92df654d58b72a229d8a6 /mkspecs | |
| parent | d22741b4bee0e526aefbbd7b851c2aa1b0b1c5b6 (diff) | |
| parent | 4e6790c8dc21c5287bff6799fb0984a72e2f2766 (diff) | |
| download | Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.zip Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.gz Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/qws/macx-generic-g++/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index 63bfc57..8dcbb39 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf @@ -27,7 +27,7 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden -QMAKE_CXX = $(TB)c++ +QMAKE_CXX = c++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF |