3 files changed, 7 insertions, 3 deletions
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp
index cb969a3df..f55b6d721 100644
--- a/Source/WebKit/qt/Api/qwebsettings.cpp
+++ b/Source/WebKit/qt/Api/qwebsettings.cpp
@@ -272,9 +272,10 @@ void QWebSettingsPrivate::apply()
                                       global->attributes.value(QWebSettings::LocalStorageEnabled));
         settings->setLocalStorageEnabled(value);
 
-        value = attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls,
+        bool remoteAccess = attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls,
                                       global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls));
-        settings->setAllowUniversalAccessFromFileURLs(value);
+        settings->setAllowUniversalAccessFromFileURLs(remoteAccess);
+        settings->setAllowRemoteAccessFromFileURLs(remoteAccess);
 
         value = attributes.value(QWebSettings::LocalContentCanAccessFileUrls,
                                       global->attributes.value(QWebSettings::LocalContentCanAccessFileUrls));
diff --git a/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp b/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
index 8ba625a82..591fa052d 100644
--- a/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
@@ -44,6 +44,7 @@
 #include "ScriptController.h"
 #include "ScrollbarThemeQStyle.h"
 #include "SecurityPolicy.h"
+#include "Settings.h"
 
 #include "qwebelement_p.h"
 #include <JavaScriptCore/runtime/InitializeThreading.h>
@@ -104,6 +105,7 @@ Q_DECL_EXPORT void initializeWebCoreQt()
     if (!WebCore::memoryCache()->disabled())
         WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(60);
     WebCore::RuntimeEnabledFeatures::setCSSCompositingEnabled(true);
+    WebCore::Settings::setDefaultMinDOMTimerInterval(0.004);
 
     initialized = true;
 }
diff --git a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
index 69b49bdbf..975fa4025 100644
--- a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
+++ b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
@@ -22,6 +22,7 @@
 
 #include "qwebkitplatformplugin.h"
 #include <wtf/Platform.h>
+#include <QtCore/QPointer>
 
 #ifndef QT_NO_COMBOBOX
 
@@ -56,7 +57,7 @@ private Q_SLOTS:
     void deleteComboBox();
 
 private:
-    QtWebComboBox* m_combo;
+    QPointer<QtWebComboBox> m_combo;
     const QWebPageAdapter* m_page;
     QRect m_geometry;
     QFont m_font;