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: (27 commits)
  Work around a compiler bug on 64-bit.
  Fix handling of braces/no-braces in QUrl::host / setHost.
  Changes (and minor corrections) to QByteArray documentation.
  QtWebKit: Update tag files to match the same content on qtwebkit.git
  QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
  QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
  uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.
  uic: Improve messages.
  Tools (uic/rcc): Improve warning messages.
  QDir: Removed checks for existance of fileEngine
  QDir and QFileInfo shouldn't lose properties when detaching
  Another bug-o introduced in fixing QDirPrivate refactoring
  Reverting QDir::detach introduced earlier
  QFileInfo: Prepare for engine-less implementation
  Removed QFileInfoPrivate::initFileEngine
  Simplify QDir::cd
  QDir::makeAbsolute could self-destruct on failure
  QDir::operator= simplification
  QDirPrivate refactoring
  QDirPrivate refactoring
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
index 73efc0d..a56040c 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
@@ -3465,17 +3465,17 @@ skip_id_custom_self:
                 goto vm_throw;
             }
             ASSERT(!callFrame->callee()->isHostFunction());
-            uint32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount();
-            uint32_t inplaceArgs = min(argCount, expectedParams);
-            uint32_t i = 0;
+            int32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount();
+            int32_t inplaceArgs = min(static_cast<int32_t>(argCount), expectedParams);
+            int32_t i = 0;
             Register* argStore = callFrame->registers() + argsOffset;
 
             // First step is to copy the "expected" parameters from their normal location relative to the callframe
             for (; i < inplaceArgs; i++)
                 argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams];
             // Then we copy any additional arguments that may be further up the stack ('-1' to account for 'this')
-            for (; i < argCount; i++)
-                argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams - argCount - 1];
+            for (; i < static_cast<int32_t>(argCount); i++)
+                argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams - static_cast<int32_t>(argCount) - 1];
         } else if (!arguments.isUndefinedOrNull()) {
             if (!arguments.isObject()) {
                 exceptionValue = createInvalidParamError(callFrame, "Function.prototype.apply", arguments, vPC - callFrame->codeBlock()->instructions().begin(), callFrame->codeBlock());