diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-04-30 10:44:29 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 08:40:48 +0200 |
commit | c3e1e6390edbc28e6e528f401eb4f3639661302b (patch) | |
tree | 5c882bfe7fced9b357e80a6b56ccdc88de8a41c3 /src/quick/items/qquickwindow.cpp | |
parent | 9709d04ba7787c853a1ddbeed0347eab27c0924f (diff) | |
parent | 6a2febc680e163e56eb61d322d156dbf6fb07e0e (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index b3417cc727..2c929113f6 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -169,6 +169,7 @@ private: }; #include "qquickwindow.moc" +#include "moc_qquickwindow_p.cpp" #if QT_CONFIG(accessibility) @@ -4223,7 +4224,7 @@ void QQuickWindow::resetOpenGLState() \since 5.9 - \sa QWindow::setScreen(), QWindow::screen(), QScreen, Qt.application + \sa QWindow::setScreen(), QWindow::screen(), QScreen, {QtQml::Qt::application}{Qt.application} */ /*! @@ -4572,6 +4573,20 @@ void QQuickWindow::setSceneGraphBackend(const QString &backend) } /*! + Returns the requested Qt Quick scenegraph \a backend. + + \note The return value of this function may still be outdated by + subsequent calls to setSceneGraphBackend() until the first QQuickWindow in the + application has been constructed. + + \since 5.9 + */ +QString QQuickWindow::sceneGraphBackend() +{ + return QSGContext::backend(); +} + +/*! Creates a simple rectangle node. When the scenegraph is not initialized, the return value is null. This is cross-backend alternative to constructing a QSGSimpleRectNode directly. |