diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:06 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:06 +0100 |
| commit | 675c150a28ae9f1ca5f4960caeed522da534f6fc (patch) | |
| tree | f29de6db23985893ed21c8caaf2fbc1e10aa063b /src/quicktemplates2/qquickabstractbutton_p_p.h | |
| parent | e052684db6e0814a6a3397eb21e3ce9f922563da (diff) | |
| parent | 95b4996a04989aa26c8fba8aaa90b76b7166c2c1 (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I2934d3f51fea9626fd2d2512786eb297d9f7fe6c
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 1c493cd8..bb74e143 100644 --- a/src/quicktemplates2/qquickabstractbutton_p_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p_p.h @@ -96,6 +96,8 @@ public: void actionTextChange(); void setText(const QString &text, bool isExplicit); + void updateEffectiveIcon(); + void click(); void trigger(); void toggle(bool value); @@ -124,6 +126,7 @@ public: QKeySequence shortcut; #endif QQuickIcon icon; + QQuickIcon effectiveIcon; QPointF pressPoint; QPointF movePoint; Qt::MouseButtons pressButtons; |