Skip to content
Permalink
Browse files

Temporarily revert "add sip bindings to webkit stubs"

This reverts commit dd69a59.

The commit was causing build failures on Travis
  • Loading branch information
nyalldawson committed May 27, 2016
1 parent cc7eb27 commit 4da6588494208bcea62d72b245d886487beee651
Showing with 14 additions and 198 deletions.
  1. +0 −4 python/CMakeLists.txt
  2. +0 −4 python/core/core.sip
  3. +0 −140 python/core/qgswebpage.sip
  4. +0 −46 python/core/qgswebview.sip
  5. +9 −3 src/core/qgswebpage.h
  6. +5 −1 src/core/qgswebview.h
@@ -134,10 +134,6 @@ ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM)
ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")

IF(NOT WITH_QTWEBKIT)
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} WebKit)
ENDIF(NOT WITH_QTWEBKIT)

IF(NOT WITH_TOUCH)
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
ENDIF(NOT WITH_TOUCH)
@@ -3,7 +3,6 @@
keyword_arguments="Optional")

%Feature QT5_SUPPORT
%Feature WebKit

%Import QtXml/QtXmlmod.sip
%Import QtNetwork/QtNetworkmod.sip
@@ -161,9 +160,6 @@
%Include qgsvisibilitypresetcollection.sip
%Include qgsxmlutils.sip

%Include qgswebview.sip
%Include qgswebpage.sip

%Include auth/qgsauthcertutils.sip
%Include auth/qgsauthconfig.sip
// %Include auth/qgsauthcrypto.sip

This file was deleted.

This file was deleted.

@@ -75,7 +75,7 @@ class CORE_EXPORT QWebSettings : public QObject
CaretBrowsingEnabled,
NotificationsEnabled
};
explicit QWebSettings( QObject* parent = nullptr )
explicit QWebSettings( QObject* parent = 0 )
: QObject( parent )
{

@@ -117,7 +117,7 @@ class CORE_EXPORT QWebPage : public QObject
WebModalDialog
};

explicit QWebPage( QObject* parent = nullptr )
explicit QWebPage( QObject* parent = 0 )
: QObject( parent )
, mSettings( new QWebSettings() )
, mFrame( new QWebFrame() )
@@ -175,7 +175,12 @@ class CORE_EXPORT QWebPage : public QObject
return new QMenu();
}

signals:

public slots:

protected:

virtual void javaScriptConsoleMessage( const QString& , int, const QString& ) {}

private:
@@ -200,7 +205,7 @@ class CORE_EXPORT QgsWebPage : public QWebPage
/** Constructor for QgsWebPage.
* @param parent parent object
*/
explicit QgsWebPage( QObject* parent = nullptr )
explicit QgsWebPage( QObject* parent = 0 )
: QWebPage( parent )
{}

@@ -219,6 +224,7 @@ class CORE_EXPORT QgsWebPage : public QWebPage
QString identifier() const { return mIdentifier; }

protected:

virtual void javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& ) override
{
if ( mIdentifier.isEmpty() )
@@ -57,7 +57,7 @@ class CORE_EXPORT QgsWebView : public QWidget
/// @cond NOT_STABLE_API
Q_OBJECT
public:
explicit QgsWebView( QWidget *parent = nullptr )
explicit QgsWebView( QWidget *parent = 0 )
: QWidget( parent )
, mSettings( new QWebSettings() )
, mPage( new QWebPage() )
@@ -111,6 +111,10 @@ class CORE_EXPORT QgsWebView : public QWidget

}

signals:

public slots:

private:
QWebSettings* mSettings;
QWebPage* mPage;

0 comments on commit 4da6588

Please sign in to comment.
You can’t perform that action at this time.