diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2009-10-28 14:15:46 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2009-10-28 14:15:46 (GMT) |
| commit | 36e362cffe74d8f7fb3eb6b6a67fbab2ebda1a21 (patch) | |
| tree | 32b922bf92d332c7b664b3c706855d020f6d8b10 /mkspecs/unsupported | |
| parent | 0533c709188d07be0c165838b503124cb6b271e1 (diff) | |
| download | Qt-36e362cffe74d8f7fb3eb6b6a67fbab2ebda1a21.zip Qt-36e362cffe74d8f7fb3eb6b6a67fbab2ebda1a21.tar.gz Qt-36e362cffe74d8f7fb3eb6b6a67fbab2ebda1a21.tar.bz2 | |
Make Qt on QNX compile again
Fix a typo, update the tmp path to match current qws behavior.
Diffstat (limited to 'mkspecs/unsupported')
| -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 f309f81..1bf9ffcb 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 3f24cd9..fffb80f 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 = |