diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 01:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 01:00:06 +0200 |
| commit | 1939ecb562c572b44425599523cb7e18f60331fb (patch) | |
| tree | 428fb81e79d651ea8b98988681b6ea7a407f4df1 /src/imports/localstorage | |
| parent | f0f01cc37910a6b1ca454a4374138d76cd09901a (diff) | |
| parent | fb20d2f7b149725b0fcc8e5bbb377cd6dababc9b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ibeba10bc821a01125a485df48a0bc88c45c01a73
Diffstat (limited to 'src/imports/localstorage')
| -rw-r--r-- | src/imports/localstorage/localstorage.pro | 2 | ||||
| -rw-r--r-- | src/imports/localstorage/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/localstorage/plugins.qmltypes | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro index 15753263b8..2fc976d37d 100644 --- a/src/imports/localstorage/localstorage.pro +++ b/src/imports/localstorage/localstorage.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qmllocalstorageplugin TARGETPATH = QtQuick/LocalStorage -IMPORT_VERSION = 2.0 +IMPORT_VERSION = 2.$${QT_MINOR_VERSION} QT = sql qml-private core-private diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 2f8bd50d9c..2756f1f616 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -523,7 +523,7 @@ through the data. /*! - \qmlmodule QtQuick.LocalStorage 2 + \qmlmodule QtQuick.LocalStorage 2.11 \title Qt Quick Local Storage QML Types \ingroup qmlmodules \brief Provides a JavaScript object singleton type for accessing a local diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes index dee81a78d0..412989c001 100644 --- a/src/imports/localstorage/plugins.qmltypes +++ b/src/imports/localstorage/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 -noforceqtquick QtQuick.LocalStorage 2.0' +// 'qmlplugindump -nonrelocatable QtQuick.LocalStorage 2.11' Module { dependencies: [] |