diff options
author | Christian Strømme <[email protected]> | 2015-05-26 16:58:24 +0200 |
---|---|---|
committer | Christian Stromme <[email protected]> | 2015-05-27 12:06:35 +0000 |
commit | 9b57e2f1765c0b4db6c3a9edf4277fc784a245f7 (patch) | |
tree | e2dd90095e697cac57bd70216aeb45df8cb0f75e | |
parent | 2e757386c5024a916b4029ab549561a0927b3c44 (diff) |
Re-introduce the default WebView implementation.
The default WebView implementation is a non-functional implementation
and its only purpose is to build the, internal only, module library
when building with MSVC. Technically the module library could be skipped
completely as the QtWebView module only provides a qml interface,
however, that means additional changes would need to be done to the
qml project recipes to make it possible for pure qml plugins to have jar
dependencies.
Task-number: QTBUG-46001
Change-Id: I1127c80902a53ad27c80d5ed86a43ab654ebd9a6
Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
-rw-r--r-- | src/imports/imports.pro | 2 | ||||
-rw-r--r-- | src/webview/qwebview_default.cpp | 67 | ||||
-rw-r--r-- | src/webview/webview-lib.pri | 11 | ||||
-rw-r--r-- | src/webview/webview.pro | 1 |
4 files changed, 12 insertions, 69 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 60ce107..dfb1f19 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -8,7 +8,7 @@ SOURCES += \ $$PWD/webview.cpp android|mac { - QT += webview webview-private + QT += webview-private } else:qtHaveModule(webengine) { QT += webengine webengine-private DEFINES += QT_WEBVIEW_WEBENGINE_BACKEND diff --git a/src/webview/qwebview_default.cpp b/src/webview/qwebview_default.cpp index b58c9b5..5f56b6a 100644 --- a/src/webview/qwebview_default.cpp +++ b/src/webview/qwebview_default.cpp @@ -34,71 +34,12 @@ ** ****************************************************************************/ -#include "qwebview_p.h" -#include "qwebview_default_p.h" +#include "qwebview_global.h" QT_BEGIN_NAMESPACE -QWebViewPrivate *QWebViewPrivate::create(QWebView *q) -{ - return new QDefaultWebViewPrivate(q); -} - -QDefaultWebViewPrivate::QDefaultWebViewPrivate(QWebView *q) - : QWebViewPrivate(q) -{ -} - -QDefaultWebViewPrivate::~QDefaultWebViewPrivate() -{ -} - -QString QDefaultWebViewPrivate::getUrl() const -{ - return QString(); -} - -void QDefaultWebViewPrivate::loadUrl(const QString &url) -{ - Q_UNUSED(url); -} - -void QDefaultWebViewPrivate::loadHtml(const QString &html, const QUrl &baseUrl) -{ - Q_UNUSED(html); - Q_UNUSED(baseUrl); -} - -bool QDefaultWebViewPrivate::canGoBack() const -{ - return false; -} - -void QDefaultWebViewPrivate::goBack() const -{ -} - -bool QDefaultWebViewPrivate::canGoForward() const -{ - return false; -} - -void QDefaultWebViewPrivate::goForward() const -{ -} - -QString QDefaultWebViewPrivate::getTitle() const -{ - return QString(); -} - -void QDefaultWebViewPrivate::stopLoading() const -{ -} - -void *QDefaultWebViewPrivate::nativeWebView() const -{ - return 0; -} +struct QWebView {}; +struct Q_WEBVIEW_EXPORT QWebViewPrivate { static QWebViewPrivate *create(QWebView *q); }; +QWebViewPrivate *QWebViewPrivate::create(QWebView *) { return 0; } QT_END_NAMESPACE diff --git a/src/webview/webview-lib.pri b/src/webview/webview-lib.pri index 7a8aa09..9506a79 100644 --- a/src/webview/webview-lib.pri +++ b/src/webview/webview-lib.pri @@ -54,11 +54,12 @@ android { $$COMMON_HEADERS \ qwebview_osx_p.h -} else { - qtHaveModule(webengine) { - QT += webengine webengine-private - DEFINES += QT_WEBVIEW_WEBENGINE_BACKEND - } +} else:qtHaveModule(webengine) { + QT += webengine webengine-private + DEFINES += QT_WEBVIEW_WEBENGINE_BACKEND + SOURCES += \ + qwebview_default.cpp + } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/webview/webview.pro b/src/webview/webview.pro index 6b0eb41..48db44b 100644 --- a/src/webview/webview.pro +++ b/src/webview/webview.pro @@ -3,6 +3,7 @@ include($$PWD/webview-lib.pri) load(qt_build_config) TARGET = QtWebView +CONFIG += internal_module QT += core-private gui-private qml-private quick-private quick qml |