diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-01-31 16:28:07 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-02-05 15:14:48 +0000 |
| commit | a5aa09dfd7e42f38545fe4640b0fa251bdd32be9 (patch) | |
| tree | 64da9335dc93d496239767bf18a07a0e3ce8f8cb /src/quicktemplates2/qquickabstractbutton_p_p.h | |
| parent | b9584b13d53f36da5585051346d03a86650961bc (diff) | |
Make AbstractButton's icon properties win over Action's when both are set
Task-number: QTBUG-65193
Change-Id: Idff23dcc35f3c3fe41406678613b022098149318
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickabstractbutton_p_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h index 3b2a87f2..c82f8cf7 100644 --- a/src/quicktemplates2/qquickabstractbutton_p_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p_p.h @@ -93,6 +93,8 @@ public: void actionTextChange(); void setText(const QString &text, bool isExplicit); + void updateEffectiveIcon(); + void click(); void trigger(); void toggle(bool value); @@ -119,6 +121,7 @@ public: QKeySequence shortcut; #endif QQuickIcon icon; + QQuickIcon effectiveIcon; QPointF pressPoint; Qt::MouseButtons pressButtons; QQuickDeferredPointer<QQuickItem> indicator; |