diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dist/changes-5.13.0 | 18 | ||||
| -rw-r--r-- | src/imports/dependencies.json | 7 | ||||
| -rw-r--r-- | src/imports/imports.pro | 2 | ||||
| -rw-r--r-- | src/imports/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/webview.cpp | 3 | ||||
| -rw-r--r-- | src/webview/doc/src/qtwebview-qmltypes.qdoc | 6 |
7 files changed, 35 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index d01fb79..1d7835f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.4 +MODULE_VERSION = 5.13.0 diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0 new file mode 100644 index 0000000..ebb4be1 --- /dev/null +++ b/dist/changes-5.13.0 @@ -0,0 +1,18 @@ +Qt 5.13 introduces many new features and improvements as well as bugfixes +over the 5.12.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/src/imports/dependencies.json b/src/imports/dependencies.json new file mode 100644 index 0000000..bbcd542 --- /dev/null +++ b/src/imports/dependencies.json @@ -0,0 +1,7 @@ +[ + { + "name": "QtQuick", + "type": "module", + "version": "2.0" + } +] diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 43b4403..feeb9f1 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.1 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION QT += qml quick webview-private SOURCES += \ diff --git a/src/imports/plugins.qmltypes b/src/imports/plugins.qmltypes index 7f05f76..3a143fd 100644 --- a/src/imports/plugins.qmltypes +++ b/src/imports/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtWebView 1.1' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebView 1.13' Module { dependencies: ["QtQuick 2.0"] diff --git a/src/imports/webview.cpp b/src/imports/webview.cpp index 792d7fa..d73ce09 100644 --- a/src/imports/webview.cpp +++ b/src/imports/webview.cpp @@ -57,6 +57,9 @@ public: qmlRegisterType<QQuickWebView>(uri, 1, 0, "WebView"); qmlRegisterType<QQuickWebView, 1>(uri, 1, 1, "WebView"); qmlRegisterUncreatableType<QQuickWebViewLoadRequest>(uri, 1, 1, "WebViewLoadRequest", msg); + + // Make sure we're always available under version x.QT_VERSION_MINOR + qmlRegisterModule(uri, 1, QT_VERSION_MINOR); } void initializeEngine(QQmlEngine *engine, const char *uri) diff --git a/src/webview/doc/src/qtwebview-qmltypes.qdoc b/src/webview/doc/src/qtwebview-qmltypes.qdoc index 2fe1ca1..b5da115 100644 --- a/src/webview/doc/src/qtwebview-qmltypes.qdoc +++ b/src/webview/doc/src/qtwebview-qmltypes.qdoc @@ -27,7 +27,7 @@ /*! - \qmlmodule QtWebView 1.1 + \qmlmodule QtWebView 1.\QtMinorVersion \title Qt WebView QML Types \ingroup qmlmodules \brief Provides QML types for Qt WebView. @@ -39,7 +39,9 @@ import statement: \badcode - import QtWebView 1.1 + \qml \QtMinorVersion + import QtWebView 1.\1 + \endqml \endcode \section1 QML Types |