diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-16 03:00:59 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-16 03:01:00 +0200 |
| commit | 8b61881469901a793e9ac8eec7caefad547258a2 (patch) | |
| tree | fc85f58a91776cfe1f57f2cdf7f1267833041eec /src/imports/controls | |
| parent | d1fdbd128f6e95255c7d9fc20ef07f44677a649e (diff) | |
| parent | ced7d5af9caeedd7b3a2278b052a0b0f7bf951b7 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ica87b5aac6a7ca335acd9c5da998cc1831347420
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/controls.pro | 2 | ||||
| -rw-r--r-- | src/imports/controls/plugins.qmltypes | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index db0d14ae..2aeaf9ab 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -1,6 +1,6 @@ TARGET = qtquickcontrols2plugin TARGETPATH = QtQuick/Controls.2 -IMPORT_VERSION = 2.5 +IMPORT_VERSION = 2.$$QT_MINOR_VERSION QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index 26f0251c..9b4610f0 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/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 -dependencies dependencies.json QtQuick.Controls 2.5' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls 2.13' Module { dependencies: [ |