git.iko.soy/unity8
on xenial help sign in
remove bit of cleanup that is in another branch; we conflict if I include it
fa2c50eMichael Terry
tests/mocks/Unity/Application/SurfaceManager.cpp−1
compare with xenial
unifiedsplit
@@ -64,7 +64,6 @@ MirSurface *SurfaceManager::inputMethodSurface()
64 m_virtualKeyboard = new VirtualKeyboard;
64 m_virtualKeyboard = new VirtualKeyboard;
65 connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
65 connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
66 MirSurface* surface = qobject_cast<MirSurface*>(obj);
66 MirSurface* surface = qobject_cast<MirSurface*>(obj);
67− m_virtualKeyboard = nullptr;
68 Q_EMIT surfaceDestroyed(surface);
67 Q_EMIT surfaceDestroyed(surface);
69 });
68 });
70 Q_EMIT surfaceCreated(m_virtualKeyboard);
69 Q_EMIT surfaceCreated(m_virtualKeyboard);