Merge branch 'dev' into phantomjs

vitallium · May 15, 2016 · 38e51b2 · 38e51b2
2 parents 588592d + 25b391f
commit 38e51b2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Source/WebCore/plugins/PluginPackage.h b/Source/WebCore/plugins/PluginPackage.h
@@ -60,8 +60,13 @@ namespace WebCore {
         const MIMEToDescriptionsMap& mimeToDescriptions() const { return m_mimeToDescriptions; }
         const MIMEToExtensionsMap& mimeToExtensions() const { return m_mimeToExtensions; }
 
+#if !ENABLE(NETSCAPE_PLUGIN_API) && OS(WINDOWS) && PLATFORM(QT)
+        unsigned int hash() const { return 0; }
+        static bool equal(const PluginPackage &a, const PluginPackage &b) { return false ;}
+#else
         unsigned hash() const;
         static bool equal(const PluginPackage& a, const PluginPackage& b);
+#endif
 
         bool load();
         void unload();

diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp
@@ -943,9 +943,9 @@ void QWebFrame::print(QPrinter *printer, PrintCallback *callback) const
     \sa addToJavaScriptWindowObject(), javaScriptWindowObjectCleared(),
     QWebElement::evaluateJavaScript()
 */
-QVariant QWebFrame::evaluateJavaScript(const QString& scriptSource)
+QVariant QWebFrame::evaluateJavaScript(const QString& scriptSource, const QUrl& location)
 {
-    return d->evaluateJavaScript(scriptSource);
+    return d->evaluateJavaScript(scriptSource, location);
 }
 
 /*!

diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf
@@ -129,9 +129,6 @@ defineTest(finalizeConfigure) {
     production_build:android {
         addReasonForSkippingBuild("Build not supported on Android.")
     }
-    !gnu_thin_archives:!win32-msvc2013:!mingw:contains(QT_CONFIG, static) {
-        addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.")
-    }
     winrt: addReasonForSkippingBuild("QtWebKit is not supported on Windows Phone/Windows RT")
     requiredPrograms = gperf python perl bison ruby flex
     for(program, requiredPrograms): \