Skip to content
Permalink
Browse files
Fixes in qgswebframe.h and qgswebpage.h to fix building without QtWebKit
  • Loading branch information
rouault committed May 14, 2016
1 parent ae7666f commit e5e78af8a12a61c32ff56a951036af25e3ddbfc5
Showing with 7 additions and 1 deletion.
  1. +6 −0 src/core/qgswebframe.h
  2. +1 −1 src/core/qgswebpage.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
@@ -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;

0 comments on commit e5e78af

Please sign in to comment.