diff options
author | David Boddie <dboddie@trolltech.com> | 2010-05-06 18:26:59 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-05-06 18:26:59 (GMT) |
commit | 109024630cbf577d6f6bcb10ea3ac6272113b79e (patch) | |
tree | 92dcb243f3ac3cadb1efdc7a3a646f880c544955 /mkspecs/unsupported/qws/qnx-641/qmake.conf | |
parent | a182cc5d5d7a70d0423a42123bb7c1cf21709e0d (diff) | |
parent | 4a934cb8bb610119367f918957d871fbbc2799ff (diff) | |
download | Qt-109024630cbf577d6f6bcb10ea3ac6272113b79e.zip Qt-109024630cbf577d6f6bcb10ea3ac6272113b79e.tar.gz Qt-109024630cbf577d6f6bcb10ea3ac6272113b79e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'mkspecs/unsupported/qws/qnx-641/qmake.conf')
-rw-r--r-- | mkspecs/unsupported/qws/qnx-641/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/unsupported/qws/qnx-641/qmake.conf b/mkspecs/unsupported/qws/qnx-641/qmake.conf index 12eaf1d..441f408 100644 --- a/mkspecs/unsupported/qws/qnx-641/qmake.conf +++ b/mkspecs/unsupported/qws/qnx-641/qmake.conf @@ -51,7 +51,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = QMAKE_LN_SHLIB = -cp -QMAKE_RPATH = -Wl,-rpath, +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_PCH_OUTPUT_EXT = .gch |