Make QQuickIcon a value type

QQuickIcon no longer inherits QObject, but becomes a light-weight
implicitly shared Q_GADGET-type, that is passed by value the same
way fonts and colors are.

Before:

  SUB: OS:          Fedora 25 (Workstation Edition)
  SUB: QPA:         xcb
  SUB: GL_VENDOR:   Intel Open Source Technology Center
  SUB: GL_RENDERER: Mesa DRI Intel(R) Haswell Desktop
  SUB: GL_VERSION:  3.0 Mesa 13.0.4
  SUB: running: benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml
  SUB:     110 frames
  SUB:     109 frames
  SUB:     109 frames
  SUB:     109 frames
  SUB:     109 frames
  SUB:     Average:
  SUB: 109.2  frames; using  samples; MedianAll=109; StdDev=0.447214, CoV=0.00409536

After:

  [...]
  SUB: running: benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml
  SUB:     123 frames
  SUB:     124 frames
  SUB:     124 frames
  SUB:     122 frames
  SUB:     125 frames
  SUB:     Average:
  SUB: 123.6  frames; using  samples; MedianAll=124; StdDev=1.14018, CoV=0.00922472

Change-Id: I604532204fb94fc0726d0c9b8b6097f9ebc265e8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/quicktemplates2/qquickaction_p.h b/src/quicktemplates2/qquickaction_p.h
index d47b847e..ce989bed 100644
--- a/src/quicktemplates2/qquickaction_p.h
+++ b/src/quicktemplates2/qquickaction_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
-
+#include <QtQuickTemplates2/private/qquickicon_p.h>
 #include <QtCore/qobject.h>
 #include <QtQml/qqml.h>
 
@@ -62,7 +62,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAction : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
-    Q_PROPERTY(QQuickIcon *icon READ icon CONSTANT FINAL)
+    Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged RESET resetEnabled FINAL)
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL)
     Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL)
@@ -75,7 +75,8 @@ public:
     QString text() const;
     void setText(const QString &text);
 
-    QQuickIcon *icon() const;
+    QQuickIcon icon() const;
+    void setIcon(const QQuickIcon &icon);
 
     bool isEnabled() const;
     void setEnabled(bool enabled);
@@ -96,6 +97,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void textChanged(const QString &text);
+    void iconChanged(const QQuickIcon &icon);
     void enabledChanged(bool enabled);
     void checkedChanged(bool checked);
     void checkableChanged(bool checkable);