diff options
| author | axis <qt-info@nokia.com> | 2009-10-29 09:20:38 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-29 09:20:38 +0100 |
| commit | eed04255446df8a749390e14cef7672c26329f6e (patch) | |
| tree | 1b6cbd53bb0f90f27db3d4e36370bca024e4abad /mkspecs | |
| parent | f360555f3c7ded3c729ce972fbd65f035876b1b4 (diff) | |
| parent | f425c08d4f2e7f061a0ee8e4a1eee2b17fa64962 (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/unsupported/qnx-g++/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/unsupported/qnx-g++/qplatformdefs.h b/mkspecs/unsupported/qnx-g++/qplatformdefs.h index f309f81f04..1bf9ffcb3e 100644 --- a/mkspecs/unsupported/qnx-g++/qplatformdefs.h +++ b/mkspecs/unsupported/qnx-g++/qplatformdefs.h @@ -167,6 +167,6 @@ inline float strtof(const char *b, char **e) return float(strtod(b, e)); } -#define QT_QWS_TEMP_DIR qgetenv("TMP"); +#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP")) #endif // QPLATFORMDEFS_H diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf index 3f24cd9b4f..fffb80fa67 100644 --- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf +++ b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf @@ -56,10 +56,10 @@ QMAKE_PCH_OUTPUT_EXT = .gch QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, -include(../../common/unix.conf) +include(../../../common/unix.conf) QMAKE_CFLAGS_THREAD = -D_REENTRANT -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CLFAGS_THREAD +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_INCDIR = QMAKE_LIBDIR = |