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: (24 commits)
  Amend qfiledialog INTEGRITY patch
  Update to latest INTEGRITY Framebuffer API.
  Remove support for tilde expansion as there is no home on INTEGRITY.
  Remove docs and translations generation for INTEGRITY.
  Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY.
  Remove QT 3 API support by default for INTEGRITY.
  Disable some tests because INTEGRITY doesn't support shared libraries.
  Add specific INTEGRITY cases for autotests requiring a target path.
  Improve default mkspec for INTEGRITY.
  Use Q_FUNC_INFO without line number on GHS compiler.
  Add INTEGRITY gbuild.* files to qmake project.
  Use the project root from .gpj project files, instead of local path.
  Make sure QMAKE_CXX is defined to prevent crashing on some projects.
  Add support for .pro-type subdirectories.
  Add relative path to the work directory, to prevent filename clashes.
  Only call moc if the file needs it.
  Use outname to specify the output .gpj to generate.
  Use "dll" instead of "shared".
  Instead of translating / into _, check if subdir is a .pro.
  Do not generate -D defines for project types.
  ...

2 files changed, 5 insertions, 4 deletions

diff --git a/src/corelib/arch/qatomic_integrity.h b/src/corelib/arch/qatomic_integrity.h
index f957297..c72a48d 100644
--- a/src/corelib/arch/qatomic_integrity.h
+++ b/src/corelib/arch/qatomic_integrity.h
@@ -203,7 +203,7 @@ inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
 template <typename T>
 Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
 {
-    return TestAndSet((Address*)&_q_value, qt_addr(expectedValue), qt_addr(newValue)) == Success;
+    return TestAndSet(reinterpret_cast<Address *>(const_cast<T **>(&_q_value)), qt_addr(expectedValue), qt_addr(newValue)) == Success;
 }
 
 template <typename T>
@@ -231,7 +231,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
 {
     Address old_val;
     do {
-        old_val = *reinterpret_cast<Address *>(const_cast<T *>(newValue));
+        old_val = *reinterpret_cast<Address *>(const_cast<T *>(_q_value));
     } while (TestAndSet(reinterpret_cast<Address *>(const_cast<T **>(&_q_value)), old_val, qt_addr(newValue)) != Success);
     return reinterpret_cast<T *>(old_val);
 }
@@ -259,7 +259,8 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
 {
-    AtomicModify(qt_p2addr(&_q_value), qt_addr(_q_value), qt_addr(_q_value) + valueToAdd * sizeof(T));
+    Address old_value;
+    AtomicModify(reinterpret_cast<volatile Address*>(&_q_value), &old_value, 0, valueToAdd * sizeof(T));
     return _q_value;
 }
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index cfe5eea..e8c611b 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1824,7 +1824,7 @@ inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; }
 #elif defined(_MSC_VER)
 #  define Q_FUNC_INFO __FUNCSIG__
 #else
-#   if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) || defined(Q_OS_SYMBIAN)
+#   if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) || defined(Q_OS_SYMBIAN) || defined(Q_OS_INTEGRITY)
 #      define Q_FUNC_INFO __FILE__ "(line number unavailable)"
 #   else
         /* These two macros makes it possible to turn the builtin line expander into a