diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-11 12:34:58 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-12 07:54:30 +0000 |
| commit | 910f9d6930fdd739e9490fa491986d74b6a57975 (patch) | |
| tree | 63ae1acd4187411cee781d5c032f02859d1e32df /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | 60f9f2a1db179f82fd6f7ee4c4a8c2d8c837ec8a (diff) | |
Default: rename QQuickDialRing to QQuickDefaultDial
This is consistent with the other existing internal Default style
visuals QQuickDefaultBusyIndicator and QQuickDefaultProgressBar.
Change-Id: I3a84edfdd6fb8bbd8a040c633c5b6411dd5350d8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 1effbbd8..a1d8a2bb 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -53,9 +53,9 @@ #include <QtQuickTemplates2/private/qquickicon_p.h> #include "qquickdefaultbusyindicator_p.h" +#include "qquickdefaultdial_p.h" #include "qquickdefaultprogressbar_p.h" #include "qquickdefaultstyle_p.h" -#include "qquickdialring_p.h" static inline void initResources() { @@ -184,8 +184,8 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... qmlRegisterType<QQuickDefaultBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); + qmlRegisterType<QQuickDefaultDial>(import, 2, 0, "DialImpl"); qmlRegisterType<QQuickDefaultProgressBar>(import, 2, 0, "ProgressBarImpl"); - qmlRegisterType<QQuickDialRing>(import, 2, 0, "DialRing"); qmlRegisterType<QQuickPlaceholderText>(import, 2, 2, "PlaceholderText"); #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) qmlRegisterType<QQuickTumblerView>(import, 2, 1, "TumblerView"); |