git.iko.soy/unity8
on xenial help sign in
Ensure the QML engine doesn't delete our mock MirSurfaces on its own.
f5d9c63Daniel d'Andrada
tests/mocks/Unity/Application/MirSurface.cpp+3
compare with xenial
unifiedsplit
@@ -17,6 +17,7 @@
17#include "MirSurface.h"
17#include "MirSurface.h"
18
18
19#include <QDebug>
19#include <QDebug>
20+#include <QQmlEngine>
20
21
21MirSurface::MirSurface(const QString& name,
22MirSurface::MirSurface(const QString& name,
22 Mir::Type type,
23 Mir::Type type,
@@ -38,6 +39,8 @@ MirSurface::MirSurface(const QString& name,
38 , m_slowToResize(false)
39 , m_slowToResize(false)
39{
40{
40// qDebug() << "MirSurface::MirSurface() " << name;
41// qDebug() << "MirSurface::MirSurface() " << name;
42+ QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
43+
41 m_delayedResizeTimer.setInterval(600);
44 m_delayedResizeTimer.setInterval(600);
42 m_delayedResizeTimer.setSingleShot(true);
45 m_delayedResizeTimer.setSingleShot(true);
43 connect(&m_delayedResizeTimer, &QTimer::timeout, this, &MirSurface::applyDelayedResize);
46 connect(&m_delayedResizeTimer, &QTimer::timeout, this, &MirSurface::applyDelayedResize);