diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 17:47:48 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 17:47:48 +0100 |
| commit | 72447b6dbf98ace65ec46559337243970a668d26 (patch) | |
| tree | 8abf6553218b43b53823cef8f4a02b8522af9f3a /src/quick/items/qquickwindow.cpp | |
| parent | 209739056ee7316d9d6e9406aede5465e3bdff84 (diff) | |
| parent | 04d4dca69d526611b60ec32e873d5de51d10be4d (diff) | |
Merge dev into 5.7
Change-Id: I20e942d00dcb1f7947850ca12f136851922b9f1c
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 635f1da77e..10f4fb20fc 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3872,6 +3872,14 @@ void QQuickWindow::resetOpenGLState() */ /*! + \qmlattachedproperty Window Window::window + \since 5.7 + + This attached property holds the item's window. + The Window attached property can be attached to any Item. +*/ + +/*! \qmlattachedproperty int Window::width \qmlattachedproperty int Window::height \since 5.5 |