Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

second attempt to fix all other shutdown QML warnings at once

Browse source
This commit is contained in:
Alexander Ivash 2018-11-18 00:24:45 +05:30
parent fe43c733f8
commit 64d05e33c1
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/qml/src/qml/OffscreenSurface.cpp
View file

@ -389,6 +389,10 @@ void OffscreenSurface::finishQmlLoad(QQmlComponent* qmlComponent,
} }
// Allow child windows to be destroyed from JS // Allow child windows to be destroyed from JS
QQmlEngine::setObjectOwnership(newObject, QQmlEngine::JavaScriptOwnership); QQmlEngine::setObjectOwnership(newObject, QQmlEngine::JavaScriptOwnership);
// add object to the manual deletion list
_sharedObject->addToDeletionList(newObject);
newObject->setParent(parent); newObject->setParent(parent);
newItem->setParentItem(parent); newItem->setParentItem(parent);
} else { } else {

15
libraries/qml/src/qml/impl/SharedObject.cpp
View file

@ -15,6 +15,7 @@
#include <QtQml/QQmlEngine> #include <QtQml/QQmlEngine>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QPointer>
#include <NumericalConstants.h> #include <NumericalConstants.h>
#include <shared/NsightHelpers.h> #include <shared/NsightHelpers.h>
@ -96,6 +97,15 @@ SharedObject::~SharedObject() {
} }
#endif #endif
// already deleted objects will be reset to null by QPointer so it should be safe just iterate here
for (auto qmlObject : _deletionList) {
if (qmlObject) {
// manually delete not-deleted-yet qml items
QQmlEngine::setObjectOwnership(qmlObject, QQmlEngine::CppOwnership);
delete qmlObject;
}
}
if (_rootItem) { if (_rootItem) {
delete _rootItem; delete _rootItem;
_rootItem = nullptr; _rootItem = nullptr;
@ -412,6 +422,11 @@ bool SharedObject::fetchTexture(TextureAndFence& textureAndFence) {
return true; return true;
} }
void hifi::qml::impl::SharedObject::addToDeletionList(QObject * object)
{
_deletionList.append(QPointer<QObject>(object));
}
void SharedObject::setProxyWindow(QWindow* window) { void SharedObject::setProxyWindow(QWindow* window) {
#ifndef DISABLE_QML #ifndef DISABLE_QML
_proxyWindow = window; _proxyWindow = window;

4
libraries/qml/src/qml/impl/SharedObject.h
View file

@ -66,7 +66,7 @@ public:
void resume(); void resume();
bool isPaused() const; bool isPaused() const;
bool fetchTexture(TextureAndFence& textureAndFence); bool fetchTexture(TextureAndFence& textureAndFence);
void addToDeletionList(QObject* object);
private: private:
bool event(QEvent* e) override; bool event(QEvent* e) override;
@ -91,6 +91,8 @@ private:
void onAboutToQuit(); void onAboutToQuit();
void updateTextureAndFence(const TextureAndFence& newTextureAndFence); void updateTextureAndFence(const TextureAndFence& newTextureAndFence);
QList<QPointer<QObject>> _deletionList;
// Texture management // Texture management
TextureAndFence _latestTextureAndFence{ 0, 0 }; TextureAndFence _latestTextureAndFence{ 0, 0 };
QQuickItem* _item{ nullptr }; QQuickItem* _item{ nullptr };