diff options
-rw-r--r-- | dist/changes-5.6.0 | 39 | ||||
-rw-r--r-- | src/imports/imports.pro | 2 | ||||
-rw-r--r-- | src/imports/plugins.qmltypes | 3 | ||||
-rw-r--r-- | src/webview/webview-lib.pri | 6 | ||||
-rw-r--r-- | src/webview/webview.pro | 9 |
5 files changed, 49 insertions, 10 deletions
diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0 new file mode 100644 index 0000000..f35d1ea --- /dev/null +++ b/dist/changes-5.6.0 @@ -0,0 +1,39 @@ +Qt 5.6 introduces many new features and improvements as well as bugfixes +over the 5.5.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5.6 + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Important Behavior Changes * +**************************************************************************** + +- [OS X] QtWebEngine is now the default backend on OS X. +- Calling QtWebView::initialize() is now required to make sure the WebView + functions correctly on all platforms. + +**************************************************************************** +* Platform-specific Changes * +**************************************************************************** + +WinRT +---- +- Added support for Windows Runtime. + +Android +------- +- [QTBUG-49664] JavaScript evaluation will now be stopped before the + WebView is released. +- [QTBUG-49566] Accessing geolocation is now allowed when the application + has the permission for ACCESS_FINE_LOCATION. diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 197f25b..84fe775 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,7 +1,7 @@ CXX_MODULE = webview TARGET = declarative_webview TARGETPATH = QtWebView -IMPORT_VERSION = 1.0 +IMPORT_VERSION = 1.1 QT += qml quick webview-private SOURCES += \ diff --git a/src/imports/plugins.qmltypes b/src/imports/plugins.qmltypes index 4a1ba93..7f05f76 100644 --- a/src/imports/plugins.qmltypes +++ b/src/imports/plugins.qmltypes @@ -4,9 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtWebView 1.0' +// 'qmlplugindump -nonrelocatable QtWebView 1.1' Module { + dependencies: ["QtQuick 2.0"] Component { name: "QQuickViewController" defaultProperty: "data" diff --git a/src/webview/webview-lib.pri b/src/webview/webview-lib.pri index e48c728..40e97a7 100644 --- a/src/webview/webview-lib.pri +++ b/src/webview/webview-lib.pri @@ -32,8 +32,8 @@ COMMON_SOURCES += \ qwebviewloadrequest.cpp android { - QT += core-private - LIBS += -ljnigraphics + QT_FOR_PRIVATE += core-private + LIBS_PRIVATE += -ljnigraphics SOURCES += \ $$COMMON_SOURCES \ qwebview_android.cpp @@ -68,7 +68,7 @@ android { $$COMMON_HEADERS \ qwebview_winrt_p.h } else:qtHaveModule(webengine) { - QT += webengine webengine-private + QT_PRIVATE += webengine-private SOURCES += \ $$COMMON_SOURCES \ qwebview_webengine.cpp diff --git a/src/webview/webview.pro b/src/webview/webview.pro index 6b0eb41..83ef4c0 100644 --- a/src/webview/webview.pro +++ b/src/webview/webview.pro @@ -1,10 +1,9 @@ -include($$PWD/webview-lib.pri) - -load(qt_build_config) - TARGET = QtWebView -QT += core-private gui-private qml-private quick-private quick qml +QT = +QT_FOR_PRIVATE = quick-private + +include($$PWD/webview-lib.pri) QMAKE_DOCS = \ $$PWD/doc/qtwebview.qdocconf |