Fixes in qgswebframe.h and qgswebpage.h to fix building without QtWebKit

qgis · May 14, 2016 · e5e78af · e5e78af
1 parent ae7666f
commit e5e78af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/core/qgswebframe.h b/src/core/qgswebframe.h
@@ -23,6 +23,7 @@
 #include <QObject>
 #include <QPainter>
 #include <QUrl>
+#include <QVariant>
 
 /**
  * @brief The QWebFrame class is a collection of stubs to mimic the API of a QWebFrame on systems
@@ -72,6 +73,11 @@ class CORE_EXPORT QWebFrame : public QObject
 
     }
 
+    QVariant evaluateJavaScript( const QString & )
+    {
+      return QVariant();
+    }
+
   signals:
     void javaScriptWindowObjectCleared();
 /// @endcond

diff --git a/src/core/qgswebpage.h b/src/core/qgswebpage.h
@@ -181,7 +181,7 @@ class CORE_EXPORT QWebPage : public QObject
 
   protected:
 
-    virtual void javaScriptConsoleMessage( const QString , int, const QString& ) {};
+    virtual void javaScriptConsoleMessage( const QString& , int, const QString& ) {}
 
   private:
     QWebSettings* mSettings;