diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-04-03 10:28:08 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-07 18:39:10 +0000 |
| commit | aff4825e85a84c0e4132b43131b4a38514b316d8 (patch) | |
| tree | e39875fce59262ca226fa516a09a9d11a1c1bb92 /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | d3a16a910f1174ecba46625953f04ae0849e931f (diff) | |
Rename QQuickDisplayLayout to QQuickIconLabel
There are some performance improvements planned that require changes
to the class, resulting in it no longer being a layout "container".
Change-Id: Ie29f2f95eebb64b3b018746f93763fdbe79625f0
Reviewed-by: J-P Nurmi <jpnurmi@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 084a24ba..bdace39a 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -39,7 +39,7 @@ #include <QtQuickControls2/private/qquickcolor_p.h> #include <QtQuickControls2/private/qquickiconimage_p.h> #include <QtQuickControls2/private/qquickplaceholdertext_p.h> -#include <QtQuickControls2/private/qquickdisplaylayout_p.h> +#include <QtQuickControls2/private/qquickiconlabel_p.h> #include <QtQuickControls2/private/qquickstyle_p.h> #include <QtQuickControls2/private/qquickstyleplugin_p.h> #include <QtQuickControls2/private/qquickstyleselector_p.h> @@ -194,7 +194,7 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterType<QQuickIconImage>(import, 2, 3, "IconImage"); qmlRegisterSingletonType<QQuickColor>(import, 2, 3, "Color", colorSingleton); - qmlRegisterType<QQuickDisplayLayout>(import, 2, 3, "DisplayLayout"); + qmlRegisterType<QQuickIconLabel>(import, 2, 3, "IconLabel"); } QT_END_NAMESPACE |