Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I42fb7e064fa7cfedf97d0436d406cb379c846ea5

5 files changed, 11 insertions, 7 deletions

diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h
index 298a25c29..e13ae7b34 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h
@@ -396,8 +396,10 @@ public:
 
     void or32(TrustedImm32 imm, RegisterID src, RegisterID dest)
     {
-        if (!imm.m_value && !m_fixedWidth)
+        if (!imm.m_value && !m_fixedWidth) {
+            move(src, dest);
             return;
+        }
 
         if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth) {
             m_assembler.ori(dest, src, imm.m_value);
diff --git a/Source/ThirdParty/leveldb/util/status.cc b/Source/ThirdParty/leveldb/util/status.cc
index a44f35b31..bbb3540a3 100644
--- a/Source/ThirdParty/leveldb/util/status.cc
+++ b/Source/ThirdParty/leveldb/util/status.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include <stdio.h>
+#include <stdint.h>    // C99 header, available as an extension in C++98
 #include "port/port.h"
 #include "leveldb/status.h"
 
diff --git a/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp b/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
index 417c59d23..8ac6e0099 100644
--- a/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
+++ b/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
@@ -525,9 +525,10 @@ int windowsKeyCodeForKeyEvent(unsigned int keycode, bool isKeypad)
     case Qt::Key_Help:
         return VK_HELP; // (2F) HELP key
     case Qt::Key_0:
-    case Qt::Key_ParenLeft:
+    case Qt::Key_ParenRight:
         return VK_0; // (30) 0) key
     case Qt::Key_1:
+    case Qt::Key_Exclam:
         return VK_1; // (31) 1 ! key
     case Qt::Key_2:
     case Qt::Key_At:
@@ -551,7 +552,7 @@ int windowsKeyCodeForKeyEvent(unsigned int keycode, bool isKeypad)
     case Qt::Key_Asterisk:
         return VK_8; // (38) 8 key  '*'
     case Qt::Key_9:
-    case Qt::Key_ParenRight:
+    case Qt::Key_ParenLeft:
         return VK_9; // (39) 9 key '('
     case Qt::Key_A:
         return VK_A; // (41) A key case 'a': case 'A': return 0x41;
diff --git a/Source/WebKit/qt/Api/qwebelement.h b/Source/WebKit/qt/Api/qwebelement.h
index e907a69a1..92d388dfa 100644
--- a/Source/WebKit/qt/Api/qwebelement.h
+++ b/Source/WebKit/qt/Api/qwebelement.h
@@ -135,7 +135,7 @@ public:
     enum StyleResolveStrategy {
          InlineStyle,
          CascadedStyle,
-         ComputedStyle,
+         ComputedStyle
     };
     QString styleProperty(const QString& name, StyleResolveStrategy strategy) const;
     void setStyleProperty(const QString& name, const QString& value);
@@ -192,7 +192,7 @@ public:
 
     class const_iterator {
        public:
-           inline const_iterator(const QWebElementCollection* collection, int index) : i(index), collection(collection) {}
+           inline const_iterator(const QWebElementCollection* collection_, int index) : i(index), collection(collection_) {}
            inline const_iterator(const const_iterator& o) : i(o.i), collection(o.collection) {}
 
            inline const QWebElement operator*() const { return collection->at(i); }
@@ -226,7 +226,7 @@ public:
 
     class iterator {
     public:
-        inline iterator(const QWebElementCollection* collection, int index) : i(index), collection(collection) {}
+        inline iterator(const QWebElementCollection* collection_, int index) : i(index), collection(collection_) {}
         inline iterator(const iterator& o) : i(o.i), collection(o.collection) {}
 
         inline QWebElement operator*() const { return collection->at(i); }
diff --git a/Source/WebKit/qt/Api/qwebkitplatformplugin.h b/Source/WebKit/qt/Api/qwebkitplatformplugin.h
index c987069bd..10cc0fd7d 100644
--- a/Source/WebKit/qt/Api/qwebkitplatformplugin.h
+++ b/Source/WebKit/qt/Api/qwebkitplatformplugin.h
@@ -181,7 +181,7 @@ public:
 };
 
 QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "org.qt-project.Qt.WebKit.PlatformPlugin/1.9");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "org.qt-project.Qt.WebKit.PlatformPlugin/1.9")
 QT_END_NAMESPACE
 
 #endif // QWEBKITPLATFORMPLUGIN_H