diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-25 12:38:11 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-25 19:44:50 +0000 |
| commit | 68556b95bcac62c78c7d2a8bcc99ef90749209d1 (patch) | |
| tree | 461ef6b927db5d000291d8b11c0e286a3ce63c2e | |
| parent | 7c8f340c1d59975cc48f70e1a2b4ddb445f2e97d (diff) | |
Make QML import available under 1.QT_MINOR_VERSION
Fixes: QTBUG-74038
Change-Id: I7e48806bc99bbfc0a5df6db9610e1a4de831ae1f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/imports/winextras/plugin.cpp | 1 | ||||
| -rw-r--r-- | src/imports/winextras/winextras.pro | 2 | ||||
| -rw-r--r-- | src/winextras/doc/src/qtwinextras-module-qml.qdoc | 9 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp index a2009b0..f53cdf7 100644 --- a/src/imports/winextras/plugin.cpp +++ b/src/imports/winextras/plugin.cpp @@ -61,6 +61,7 @@ public: void registerTypes(const char *uri) Q_DECL_OVERRIDE { Q_ASSERT(uri == QLatin1String("QtWinExtras")); + qmlRegisterModule(uri, 1, QT_VERSION_MINOR); qmlRegisterUncreatableType<QQuickWin>(uri, 1, 0, "QtWin", "Cannot create an instance of the QtWin namespace."); qmlRegisterType<QQuickDwmFeatures>(uri, 1, 0, "DwmFeatures"); qmlRegisterType<QQuickTaskbarButton>(uri, 1, 0, "TaskbarButton"); diff --git a/src/imports/winextras/winextras.pro b/src/imports/winextras/winextras.pro index 19f8d2b..35427ba 100644 --- a/src/imports/winextras/winextras.pro +++ b/src/imports/winextras/winextras.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qml_winextras TARGETPATH = QtWinExtras -IMPORT_VERSION = 1.0 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION QT += qml quick winextras winextras-private diff --git a/src/winextras/doc/src/qtwinextras-module-qml.qdoc b/src/winextras/doc/src/qtwinextras-module-qml.qdoc index 078cb44..62797ef 100644 --- a/src/winextras/doc/src/qtwinextras-module-qml.qdoc +++ b/src/winextras/doc/src/qtwinextras-module-qml.qdoc @@ -26,10 +26,17 @@ ****************************************************************************/ /*! - \qmlmodule QtWinExtras 1.0 + \qmlmodule QtWinExtras 1.\QtMinorVersion \title Qt Windows Extras QML Types \ingroup qmlmodules \brief Enables the use of Windows features with QML. \section1 QML Types + + The QML types can be imported into your application using the + following import statement in your .qml file. + + \qml \QtMinorVersion + import QtWinExtras 1.\1 + \endqml */ |