diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-26 03:02:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-26 03:02:47 +0100 |
| commit | dffbc2b18883630e4d47281145428bcc999bc490 (patch) | |
| tree | 789437316cc6caaffa097d6cc5d2b23d89f2f6ec | |
| parent | 8022fa1e09af2a3077050840936f2067e94e79fc (diff) | |
| parent | 7d39bfe3304090ad7808a0886e249c8ecb5e06b2 (diff) | |
| download | qtgraphicaleffects-dffbc2b18883630e4d47281145428bcc999bc490.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I935b77db55d18d8deec8e600f8da8c0655b5d1ad
| -rw-r--r-- | src/effects/effects_plugin.pro | 2 | ||||
| -rw-r--r-- | src/effects/plugins.qmltypes | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/effects_plugin.pro b/src/effects/effects_plugin.pro index e889236..48b1030 100644 --- a/src/effects/effects_plugin.pro +++ b/src/effects/effects_plugin.pro @@ -2,7 +2,7 @@ CXX_MODULE = qml TARGET = qtgraphicaleffectsplugin TARGETPATH = QtGraphicalEffects QT += quick qml -IMPORT_VERSION = 1.0 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION QML_FILES = \ Blend.qml \ BrightnessContrast.qml \ diff --git a/src/effects/plugins.qmltypes b/src/effects/plugins.qmltypes index 8cbeeb7..7c2924c 100644 --- a/src/effects/plugins.qmltypes +++ b/src/effects/plugins.qmltypes @@ -4,8 +4,8 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.0' +// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.13' Module { - dependencies: ["QtQuick 2.0", "QtQuick.Window 2.1"] + dependencies: ["QtQuick 2.12", "QtQuick.Window 2.12"] } |