diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 20:44:56 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 20:44:56 +1000 |
| commit | 078a68ffc84a745830535f1eb0e19ab8a190f542 (patch) | |
| tree | da6310c113b1be22c440a3548849d1ea28aa4d18 /qmake | |
| parent | e4cce8849bf45be9a111072e3fca7bdf67364e8a (diff) | |
| parent | af3bb0f146ec357ae6daf752a5f8bbdb074cde20 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
trivial: fix typo in comment
changelog
docu update for QNX 6.5
get rid of anacronysm
massive improvements for the QNX screen driver
massive improvements for the QNX mouse driver
massive improvements for the QNX keyboard driver
disable the Embedded Linux data directory permissions check for QNX
skip two subtests that are known to fail on QNX
implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends
implement POSIX IPC based QSystemSemaphore and QSharedMemory backends
add a configure-time check for an IPC support
make QProcess really work on QNX
make the kernel attempt to emulate an instruction with a misaligned access
use RoundRobin scheduler by default on QNX
a major refactoring of the mkspecs tree for QNX
buildfix for qmake
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/qmake.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index d6c5f09107..87735d6747 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -146,7 +146,7 @@ bootstrap { #Qt code qnx { CFLAGS += -fhonor-std - LFLAGS += -lcpp + LFLAGS += -lcpp -lm } DEFINES *= QT_NO_QOBJECT } else { |