diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-08 08:49:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-01-08 08:49:33 +0000 |
| commit | 10b8f6af42a1cd80273d0a2d36e75b79078b5994 (patch) | |
| tree | 366acd2409145aba86d0ee752f15dfbf46c20b9d /src/quicktemplates2/qquickcontrol_p.h | |
| parent | d26d6a46bb5793e4a3bdc2c7a387f8f8a89b349b (diff) | |
| parent | 1fcec5bf1e208a4f32ef4f3afa54684358a11a1d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/quicktemplates2/qquickcontrol_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h index 7dd1deb3..6b2d48d6 100644 --- a/src/quicktemplates2/qquickcontrol_p.h +++ b/src/quicktemplates2/qquickcontrol_p.h @@ -81,6 +81,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControl : public QQuickItem Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) // 2.3 (Qt 5.10) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) + Q_CLASSINFO("DeferredPropertyNames", "background,contentItem") public: explicit QQuickControl(QQuickItem *parent = nullptr); |