aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-09-06 15:05:38 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-09-06 15:30:04 +0000
commit9d022b96872636a2898fd6209711c4f96a520a0e (patch)
tree6f7b7f1ae5d48ad2c93939beb62e5cdf1a851f4c
parent166c7219ceed0c73178eee7c5fa509121b4e8e65 (diff)
Register new base class revisions
QQuickText & QQuickTextEdit have gained new properties in QtQuick 2.10. Make them available in QQuickLabel and QQuickTextArea, respectively. Change-Id: I5156b683efeedd24b23c18d1c2e2509d3040b647 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/templates/qtquicktemplates2plugin.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index a8aafa2c..c3f0cdd4 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -313,6 +313,11 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
qmlRegisterType<QQuickScrollIndicator, 3>(uri, 2, 3, "ScrollIndicator");
qmlRegisterType<QQuickSlider, 3>(uri, 2, 3, "Slider");
qmlRegisterType<QQuickSpinBox, 3>(uri, 2, 3, "SpinBox");
+
+ // NOTE: register the latest revisions of all template/control base classes to
+ // make revisioned properties available to their subclasses (synced with Qt 5.10)
+ qmlRegisterRevision<QQuickText, 10>(uri, 2, 3);
+ qmlRegisterRevision<QQuickTextEdit, 10>(uri, 2, 3);
}
QT_END_NAMESPACE