diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2017-03-02 13:27:30 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-24 06:34:16 +0000 |
commit | b0d2e6d13358cc30f044504f83bd584606b6c235 (patch) | |
tree | 4755424f0682fc5e3050638750fa68e4ea3d148e /src/imports/controls/qtquickcontrols2plugin.cpp | |
parent | 46002360df4e33e07c439d1cd57f3cd39895adcd (diff) |
AbstractButton: add support for icons
This patch adds the following properties to AbstractButton:
- icon.name
- icon.source
- icon.width
- icon.height
- icon.color
Derived types implement the behavior behind these properties
using the new private IconImage type.
[ChangeLog][Controls][AbstractButton] Added support for icons. The
following properties are now available for derived types to use:
icon.name, icon.source, icon.width, icon.height, icon.color.
Task-number: QTBUG-49820
Change-Id: I3b5e4eaac390543deef60883e13539646a6bb060
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, 1 insertions, 1 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 3a131511..084a24ba 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -153,7 +153,7 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) 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) + // QtQuick.Controls 2.3 (new types in Qt 5.10) qmlRegisterType<QQuickIcon>(); } |