git.iko.soy/unity8
on xenial help sign in
fix crash on some dash tests now that it has two windows
f004c04Albert Astals Cid
tests/mocks/Unity/Application/MirSurfaceItem.cpp+8−2
compare with xenial
unifiedsplit
@@ -54,8 +54,14 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,
54 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
54 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
55
55
56 // The assumptions I make here really should hold.
56 // The assumptions I make here really should hold.
57− QQuickView *quickView =
58− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
57+ const QWindowList windows = QGuiApplication::topLevelWindows();
58+ QQuickView *quickView = nullptr;
59+ Q_FOREACH(QWindow *w, windows) {
60+ quickView = qobject_cast<QQuickView*>(w);
61+ if (quickView) {
62+ break;
63+ }
64+ }
59
65
60 QString qmlComponentFilePath;
66 QString qmlComponentFilePath;
61 if (!qmlFilePath.isEmpty()) {
67 if (!qmlFilePath.isEmpty()) {