diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2017-02-07 15:04:15 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-03-17 15:39:13 +0000 |
commit | 686698bcbbdf5e1bfa521fbe57d0f76fee8dab4b (patch) | |
tree | 43bacb1789dbd8c2141ce9cc8047d25f8ab993d1 /src/imports/controls/qtquickcontrols2plugin.cpp | |
parent | f60555b5ab7899e1f5069f319f9f26a24a53982d (diff) |
Add QQuickDisplayLayout
This class lays out an icon and text in various configurations,
depending on the display property.
Task-number: QTBUG-49820
Change-Id: I2ace443e6cb134a1032b0b79378abd2179916133
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
-rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 2cd97daa..3a131511 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -39,6 +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/qquickstyle_p.h> #include <QtQuickControls2/private/qquickstyleplugin_p.h> #include <QtQuickControls2/private/qquickstyleselector_p.h> @@ -193,6 +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"); } QT_END_NAMESPACE |