diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-02-09 11:07:30 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-02-09 13:12:08 +0000 |
| commit | 20a7378c8ff930571cc3fce81f1ae67cf1d4a5fe (patch) | |
| tree | 17d8586b55d4c50672dfefe06b9f386a0dfe6eb7 /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | b55716eda0216e8173905371989f3cd7bdb452ec (diff) | |
Add QQuickIcon
This adds the initial API needed to add support for setting icons on
buttons, etc., and is also necessary for action support.
Follow up commits will add the actual support for icons.
Change-Id: I9ab892aa4fe43210e7b18bed3e0ebcec2edb9c91
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, 4 insertions, 0 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index cd81eb62..7549194a 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -43,6 +43,7 @@ #include <QtQuickControls2/private/qquickcolorimageprovider_p.h> #include <QtQuickControls2/private/qquicktumblerview_p.h> #include <QtQuickTemplates2/private/qquickbuttongroup_p.h> +#include <QtQuickTemplates2/private/qquickicon_p.h> #include "qquickdefaultbusyindicator_p.h" #include "qquickdefaultprogressbar_p.h" @@ -144,6 +145,9 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) // QtQuick.Controls 2.2 (new types in Qt 5.9) qmlRegisterType(selector.select(QStringLiteral("DelayButton.qml")), uri, 2, 2, "DelayButton"); qmlRegisterType(selector.select(QStringLiteral("ScrollView.qml")), uri, 2, 2, "ScrollView"); + + // QtQuick.Templates 2.3 (new types and revisions in Qt 5.10) + qmlRegisterType<QQuickIcon>(); } static QObject *styleSingleton(QQmlEngine *engine, QJSEngine *scriptEngine) |