diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-06 22:13:27 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-06 22:13:27 +0200 |
| commit | 2784902b9b42de127c0903c3d6b076297cf47a07 (patch) | |
| tree | 3b95b5cdf61c951f7d54fccf47b14a0ccbce7e6c /src/imports/templates | |
| parent | 0a96b436d9845899888f7c7d153f0d9909ce4c06 (diff) | |
| parent | f8224c9c9e3dfc1fd4cc3bff915e7e2d1c411d05 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I4a07d331163a85a0fb98a5f58f3970863f8da0fc
Diffstat (limited to 'src/imports/templates')
| -rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index a43d5baf..becea232 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -252,6 +252,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) // NOTE: register the latest revisions of all template/control base classes to // make revisioned properties available to their subclasses (synced with Qt 5.9) qmlRegisterRevision<QQuickText, 9>(uri, 2, 2); + qmlRegisterRevision<QQuickTextInput, 9>(uri, 2, 2); // QtQuick.Templates 2.3 (new types and revisions in Qt 5.10) qmlRegisterType<QQuickIcon>(); |