Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits)
  Fix compilation with Sun CC: no semi-colon after Q_ENUM.
  Remove the "Insert unicode control character" menu entry on X11.
  adds a timeout option to QThreadPool::waitForDone();
  Remove leading whitespace from Qt header macros.
  Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
  Add QDateTime members that operate on 64-bit milliseconds.
  Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
  qdoc: Added <div> elements to some html output for class references.
  Fix compile error on mingw.
  MONILITY-645
  Do not override alternate background color in Plastique
  Fix QComboBox ignoring foreground role in some styles
  Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
  Fix compilation with Sun CC:
  Ensure that we return QPair<long,long> in all cases.
  Update PLATFORM(SPARC64) to CPU(SPARC64)
  jui files are no c++ ...
  scan some more file types by default
  Support EtchDisabledText with spin box on Windows style
  QNAM HTTP: Fix invoking a method when being destructed right now
  ...

3 files changed, 5 insertions, 5 deletions

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h
index 35fb7e4..2ecf0d3 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h
@@ -143,14 +143,14 @@ namespace JSC {
             if (!specificValue) {
                 TransitionTable::iterator find = table()->find(key);
                 if (find == table()->end())
-                    table()->add(key, Transition(structure, 0));
+                    table()->add(key, Transition(structure, (Structure*)0));
                 else
                     find->second.first = structure;
             } else {
                 // If we're adding a transition to a specific value, then there cannot be
                 // an existing transition
                 ASSERT(!table()->contains(key));
-                table()->add(key, Transition(0, structure));
+                table()->add(key, Transition((Structure*)0, structure));
             }
         }
 
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
index 5b655e8..85c8743 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
@@ -239,7 +239,7 @@ inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Bar
 inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); }
 inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); }
 
-#elif COMPILER(GCC) && !PLATFORM(SPARC64) && !defined(__SYMBIAN32__) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
+#elif COMPILER(GCC) && !CPU(SPARC64) && !defined(__SYMBIAN32__) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
 
 inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h b/src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h
index 0fa7b73..f39560a 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h
@@ -143,14 +143,14 @@ namespace JSC {
             if (!specificValue) {
                 TransitionTable::iterator find = table()->find(key);
                 if (find == table()->end())
-                    table()->add(key, Transition(structure, 0));
+                    table()->add(key, Transition(structure, (Structure*)0));
                 else
                     find->second.first = structure;
             } else {
                 // If we're adding a transition to a specific value, then there cannot be
                 // an existing transition
                 ASSERT(!table()->contains(key));
-                table()->add(key, Transition(0, structure));
+                table()->add(key, Transition((Structure*)0, structure));
             }
         }