diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-08-21 18:32:49 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-08-26 17:56:58 +0200 |
| commit | 50ccfaa7ad26e0872ac50b92b346bebbd3002838 (patch) | |
| tree | 09b7fd62612f54765a8b658862148a2574f40a33 /src/quick/items/qquickwindowmodule.cpp | |
| parent | 6b3f5442641ee53dffc5b7e8ea8679d66668d114 (diff) | |
Harmonize meta object revisions and minor versions
In order to avoid complexity we want those to match. We can easily
"rename" the meta object revisions as those are not public interfaces.
Change-Id: I48e063d49758c7bacd9b7816bf5541cf67e07b0d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindowmodule.cpp')
| -rw-r--r-- | src/quick/items/qquickwindowmodule.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index 7b3874dbfe..4b2b8f498d 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -205,11 +205,11 @@ void QQuickWindowModule::defineModule() qmlRegisterRevision<QQuickWindow,1>(uri, 2, 1);//Type moved to a subclass, but also has new members qmlRegisterRevision<QQuickWindow,2>(uri, 2, 2); qmlRegisterType<QQuickWindowQmlImpl>(uri, 2, 1, "Window"); - qmlRegisterType<QQuickWindowQmlImpl,1>(uri, 2, 2, "Window"); - qmlRegisterType<QQuickWindowQmlImpl,2>(uri, 2, 3, "Window"); + qmlRegisterType<QQuickWindowQmlImpl,2>(uri, 2, 2, "Window"); + qmlRegisterType<QQuickWindowQmlImpl,3>(uri, 2, 3, "Window"); qmlRegisterUncreatableType<QQuickScreen>(uri, 2, 0, "Screen", QStringLiteral("Screen can only be used via the attached property.")); - qmlRegisterUncreatableType<QQuickScreen,1>(uri, 2, 3, "Screen", QStringLiteral("Screen can only be used via the attached property.")); - qmlRegisterUncreatableType<QQuickScreenInfo,2>(uri, 2, 3, "ScreenInfo", QStringLiteral("ScreenInfo can only be used via the attached property.")); + qmlRegisterUncreatableType<QQuickScreen,3>(uri, 2, 3, "Screen", QStringLiteral("Screen can only be used via the attached property.")); + qmlRegisterUncreatableType<QQuickScreenInfo,3>(uri, 2, 3, "ScreenInfo", QStringLiteral("ScreenInfo can only be used via the attached property.")); qmlRegisterUncreatableType<QQuickScreenInfo,10>(uri, 2, 10, "ScreenInfo", QStringLiteral("ScreenInfo can only be used via the attached property.")); qmlRegisterRevision<QWindow,13>(uri, 2, 13); qmlRegisterRevision<QQuickWindow,13>(uri, 2, 13); |