diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-06-03 11:53:38 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-10-09 15:31:46 +0000 |
| commit | 07e0c9f8c5f78b6f3e8f46ff7cb1bb19f2a48970 (patch) | |
| tree | 16903edbe85903c03067734621fd328f7b7ee689 /src/templates/qquickapplicationwindow_p.h | |
| parent | 2f902694656d67d671d9a8616060d598a478e7b7 (diff) | |
ApplicationWindow: Add interstitial content item
The goal of this is twofold. First, it allows the window's
contentItem to follow the window size, keeping its nice
properties. And second, it prepares for adding a popup
layer item to ApplicationWindow, which should remove any
need to set high z values to ensure popup windows stay on top.
Change-Id: Ie024b7627808e2f3d22d7572f0ac5975e9bdf1a5
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickapplicationwindow_p.h')
| -rw-r--r-- | src/templates/qquickapplicationwindow_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h index 9c1d9816..7c758cad 100644 --- a/src/templates/qquickapplicationwindow_p.h +++ b/src/templates/qquickapplicationwindow_p.h @@ -58,13 +58,19 @@ class QQuickApplicationWindowPrivate; class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl { Q_OBJECT + Q_PROPERTY(QQuickItem *contentItem READ contentItem CONSTANT FINAL) + Q_PROPERTY(QQmlListProperty<QObject> data READ contentData FINAL) Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) + Q_CLASSINFO("DefaultProperty", "data") public: explicit QQuickApplicationWindow(QWindow *parent = Q_NULLPTR); ~QQuickApplicationWindow(); + QQuickItem *contentItem(); + QQmlListProperty<QObject> contentData(); + QQuickItem *header() const; void setHeader(QQuickItem *header); |