diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-31 09:04:18 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-31 09:04:18 +0200 |
commit | 9f085b889524a80d4064d6ac01dbdc817bb31060 (patch) | |
tree | a65a8871f44a0572e1459dd14759b2339f93de5e /src/controls/plugin.cpp | |
parent | 9a56985c91d16d7c42ba86f4b0a70f85973e0618 (diff) | |
parent | 8c37d58fa21fd3cf6897e2d7d4fe1f73c983d2f4 (diff) | |
download | qtquickcontrols-9f085b889524a80d4064d6ac01dbdc817bb31060.tar.gz |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia574913a1c2af6349db33966c172e96f6eb5f127
Diffstat (limited to 'src/controls/plugin.cpp')
-rw-r--r-- | src/controls/plugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 0d60ec56..2abd906e 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -164,7 +164,9 @@ void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterType<QQuickRangedDate1>(private_uri, 1, 0, "RangedDate"); qmlRegisterType<QQuickRangeModel1>(private_uri, 1, 0, "RangeModel"); qmlRegisterType<QQuickWheelArea1>(private_uri, 1, 0, "WheelArea"); +#if QT_CONFIG(validator) qmlRegisterType<QQuickSpinBoxValidator1>(private_uri, 1, 0, "SpinBoxValidator"); +#endif qmlRegisterSingletonType<QQuickTooltip1>(private_uri, 1, 0, "Tooltip", QQuickControlsPrivate1::registerTooltipModule); qmlRegisterSingletonType<QQuickControlSettings1>(private_uri, 1, 0, "Settings", QQuickControlsPrivate1::registerSettingsModule); |