Skip to content

Commit 4da6588

Browse files
committed
Temporarily revert "add sip bindings to webkit stubs"
This reverts commit dd69a59. The commit was causing build failures on Travis
1 parent cc7eb27 commit 4da6588

File tree

6 files changed

+14
-198
lines changed

6 files changed

+14
-198
lines changed

python/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
134134
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM)
135135
ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
136136

137-
IF(NOT WITH_QTWEBKIT)
138-
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} WebKit)
139-
ENDIF(NOT WITH_QTWEBKIT)
140-
141137
IF(NOT WITH_TOUCH)
142138
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
143139
ENDIF(NOT WITH_TOUCH)

python/core/core.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
keyword_arguments="Optional")
44

55
%Feature QT5_SUPPORT
6-
%Feature WebKit
76

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

164-
%Include qgswebview.sip
165-
%Include qgswebpage.sip
166-
167163
%Include auth/qgsauthcertutils.sip
168164
%Include auth/qgsauthconfig.sip
169165
// %Include auth/qgsauthcrypto.sip

python/core/qgswebpage.sip

Lines changed: 0 additions & 140 deletions
This file was deleted.

python/core/qgswebview.sip

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/core/qgswebpage.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class CORE_EXPORT QWebSettings : public QObject
7575
CaretBrowsingEnabled,
7676
NotificationsEnabled
7777
};
78-
explicit QWebSettings( QObject* parent = nullptr )
78+
explicit QWebSettings( QObject* parent = 0 )
7979
: QObject( parent )
8080
{
8181

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

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

178+
signals:
179+
180+
public slots:
181+
178182
protected:
183+
179184
virtual void javaScriptConsoleMessage( const QString& , int, const QString& ) {}
180185

181186
private:
@@ -200,7 +205,7 @@ class CORE_EXPORT QgsWebPage : public QWebPage
200205
/** Constructor for QgsWebPage.
201206
* @param parent parent object
202207
*/
203-
explicit QgsWebPage( QObject* parent = nullptr )
208+
explicit QgsWebPage( QObject* parent = 0 )
204209
: QWebPage( parent )
205210
{}
206211

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

221226
protected:
227+
222228
virtual void javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& ) override
223229
{
224230
if ( mIdentifier.isEmpty() )

src/core/qgswebview.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class CORE_EXPORT QgsWebView : public QWidget
5757
/// @cond NOT_STABLE_API
5858
Q_OBJECT
5959
public:
60-
explicit QgsWebView( QWidget *parent = nullptr )
60+
explicit QgsWebView( QWidget *parent = 0 )
6161
: QWidget( parent )
6262
, mSettings( new QWebSettings() )
6363
, mPage( new QWebPage() )
@@ -111,6 +111,10 @@ class CORE_EXPORT QgsWebView : public QWidget
111111

112112
}
113113

114+
signals:
115+
116+
public slots:
117+
114118
private:
115119
QWebSettings* mSettings;
116120
QWebPage* mPage;

0 commit comments

Comments
 (0)