diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-05-06 09:38:48 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-06 09:38:48 +0000 |
| commit | 1484039a77d86504901e82b18582d908648b8d35 (patch) | |
| tree | 87ee62bf62ab78a2d677495a7f8ba614fb01bd8a /src/quick/items/qquickwindow.cpp | |
| parent | 697cbf3474d32ebd4f7e22695223cdb8cdf44f35 (diff) | |
| parent | 9b6d55ddf361f14c05c2965b29184a95e3c6a989 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 54e4339f7e..b06cfe54cc 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -4040,6 +4040,12 @@ void QQuickWindow::resetOpenGLState() */ /*! + \qmlproperty Item Window::contentItem + \readonly + \brief The invisible root item of the scene. +*/ + +/*! \qmlproperty Qt::ScreenOrientation Window::contentOrientation This is a hint to the window manager in case it needs to display |