diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-02 09:12:54 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-02 09:13:18 +0100 |
commit | 13a6c51f26128015c0a3c335bdae676b46df6ed6 (patch) | |
tree | 479d40871c87e1904d412221e5d5c5580f6f7486 | |
parent | e9a024b442dc503d89f900ec425308c2b6792fa4 (diff) | |
parent | 3a22766e8c4ea39836f197552e92b3cc78e77f62 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ia6d9b27bc61acb333b0c06574a31b7e9b06162f2
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/imagenode.cpp | 2 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/imagenode.cpp b/src/plugins/scenegraph/softwarecontext/imagenode.cpp index 2a529c6c63..e09ad5862a 100644 --- a/src/plugins/scenegraph/softwarecontext/imagenode.cpp +++ b/src/plugins/scenegraph/softwarecontext/imagenode.cpp @@ -375,7 +375,7 @@ void ImageNode::setMipmapFiltering(QSGTexture::Filtering /*filtering*/) void ImageNode::setFiltering(QSGTexture::Filtering filtering) { - bool smooth = (filtering == QSGTexture::Nearest); + bool smooth = (filtering == QSGTexture::Linear); if (smooth == m_smooth) return; diff --git a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp index 36a8758279..cd6f1aa41d 100644 --- a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp @@ -347,7 +347,10 @@ bool RenderThread::event(QEvent *e) mutex.lock(); if (window) { - QQuickWindowPrivate::get(window)->fireAboutToStop(); + QQuickWindowPrivate *d = QQuickWindowPrivate::get(window); + d->fireAboutToStop(); + d->cleanupNodesOnShutdown(); + qCDebug(QSG_RASTER_LOG_RENDERLOOP) << QSG_RT_PAD << "- window removed"; window = 0; } |