1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
Date: Mon, 26 Sep 2016 13:02:57 +0200
Subject: [PATCH] Updated QWeb to QWebView.
---
src/Layers/LicenseDisplayDialog.ui | 6 +++---
src/QMapControl/browserimagemanager.cpp | 20 +++++++++-----------
src/QMapControl/browserimagemanager.h | 17 ++++++-----------
src/src.pro | 2 +-
4 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
index 103816c6..3dabd130 100755
--- a/src/Layers/LicenseDisplayDialog.ui
+++ b/src/Layers/LicenseDisplayDialog.ui
@@ -15,7 +15,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QWebView" name="webView">
+ <widget class="QWebEngineView" name="webView">
<property name="url">
<url>
<string>about:blank</string>
@@ -41,9 +41,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>QWebView</class>
+ <class>QWebEngineView</class>
<extends>QWidget</extends>
- <header>QtWebKit/QWebView</header>
+ <header>QWebEngineView</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp
index 468cf2b6..4021d40f 100644
--- a/src/QMapControl/browserimagemanager.cpp
+++ b/src/QMapControl/browserimagemanager.cpp
@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const QString & message, int lin
//printf("%s\n", s);
}
-void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
+void BrowserWebPage::javaScriptAlert ( const QString & msg )
{
- Q_UNUSED(frame)
//QMessageBox::information(NULL, tr("Javascript alert"), msg);
if (msg.startsWith("Coord")) {
@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
void BrowserWebPage::launchRequest ( const QUrl & url )
{
+ qDebug() << "Warning: you are using BrowserWebPage to render background imagery. "<<
+ "This code is not tested and may not work as expected. If you experience issues, please let us know.";
sw = sh = 0;
- mainFrame()->load(url);
+ load(url);
}
BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0;
@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
}
page = new BrowserWebPage();
- page->setNetworkAccessManager(m_networkManager);
- page->setViewportSize(QSize(1024, 1024));
connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool)));
@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest()
QUrl u = QUrl( R.url);
- page->networkAccessManager()->setProxy(M_PREFS->getProxy(u));
page->launchRequest(u);
requestActive = true;
#ifndef BROWSERIMAGEMANAGER_IS_THREADED
@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok)
qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << R.hash;
QPixmap pt(page->sw, page->sh);
QPainter P(&pt);
- page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh));
+ page->view()->render(&P, QPoint(), QRegion(0,0,page->sw,page->sh));
P.end();
// if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) {
@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty()
void BrowserImageManager::abortLoading()
{
//qDebug() << "BrowserImageManager::abortLoading";
- page->triggerAction(QWebPage::Stop);
+ page->triggerAction(QWebEnginePage::Stop);
if (!loadingRequests.isEmpty()) {
LoadingRequest R = loadingRequests.dequeue();
loadingRequests.clear();
@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading()
#ifdef BROWSERIMAGEMANAGER_IS_THREADED
void BrowserImageManager::run()
{
- page = new BrowserWebPage();
+ page = new BrowserWebEnginePage();
page->setViewportSize(QSize(1024, 1024));
QTimer theTimer;
@@ -354,7 +352,7 @@ void BrowserImageManager::checkRequests()
} else {
if ((requestDuration++) > 100) {
requestDuration = 0;
- page->triggerAction(QWebPage::Stop);
+ page->triggerAction(QWebEnginePage::Stop);
qDebug() << "BrowserImageManager Timeout";
}
}
@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests()
void BrowserImageManager::timeout()
{
qDebug() << "BrowserImageManager::timeout";
- page->triggerAction(QWebPage::Stop);
+ page->triggerAction(QWebEnginePage::Stop);
pageLoadFinished(false);
}
#endif // BROWSERIMAGEMANAGER_IS_THREADED
diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h
index 10f8a477..ca846e31 100644
--- a/src/QMapControl/browserimagemanager.h
+++ b/src/QMapControl/browserimagemanager.h
@@ -24,14 +24,10 @@
#include <QPixmap>
#include <QtNetwork/QtNetwork>
-#include <QWebFrame>
-#include "qwebhistory.h"
-#include "qwebhistoryinterface.h"
-#include "qwebkitglobal.h"
-#include "qwebpage.h"
-#include "qwebpluginfactory.h"
-#include "qwebsettings.h"
-#include "qwebview.h"
+#include <QWebEnginePage>
+#include <QWebEngineHistory>
+#include <QWebEngineSettings>
+#include <QWebEngineView>
#include <QThread>
@@ -41,13 +37,13 @@
@author Chris Browet <cbro@semperpax.com>
*/
-class BrowserWebPage : public QWebPage
+class BrowserWebPage : public QWebEnginePage
{
friend class BrowserImageManager;
protected:
virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID );
- virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ;
+ virtual void javaScriptAlert ( const QString & msg ) ;
void launchRequest ( const QUrl & url );
private:
@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager
static BrowserImageManager* m_BrowserImageManagerInstance;
BrowserWebPage* page;
- QWebFrame *frame;
QNetworkAccessManager* qnam;
signals:
diff --git a/src/src.pro b/src/src.pro
index eb93b263..137d7e14 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -34,7 +34,7 @@ TEMPLATE = app
CONFIG += rtti stl exceptions
#CONFIG -= exceptions
-QT += svg network xml core gui webkitwidgets concurrent printsupport
+QT += svg network xml core gui webenginewidgets concurrent printsupport
win32-msvc* {
LIBS += -lzlib
} else {
|
GitWeb