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

1 files changed, 13 insertions, 0 deletions

diff --git a/configure b/configure
index e113217df8..07930e09ac 100755
--- a/configure
+++ b/configure
@@ -5112,6 +5112,19 @@ if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
     fi
 fi
 
+# check IPC support
+if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipc_sysv "ipc_sysv" $L_FLAGS $I_FLAGS $l_FLAGS ; then
+    # SYSV IPC is not supported - check POSIX IPC
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipc_posix "ipc_posix" $L_FLAGS $I_FLAGS $l_FLAGS ; then
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
+    else
+        QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY"
+        if [ "$PLATFORM_QWS" = "yes" ]; then
+            QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SEMAPHORE QT_NO_QWS_MULTIPROCESS QT_NO_QWS_SHARE_FONTS"
+        fi
+    fi
+fi
+
 # detect zlib
 if [ "$CFG_ZLIB" = "no" ]; then
     # Note: Qt no longer support builds without zlib