git.iko.soy/unity8
on xenial help sign in
fix crashiness on exit
a53d880Michael Zanetti
qml/Dash/DashApplication.qml+1−1
compare with xenial
unifiedsplit
@@ -15,9 +15,9 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18+import QtQuick.Window 2.2
18import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
19import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
20import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
20−import QtQuick.Window 2.2
21
21
22Window {
22Window {
23 visible: true
23 visible: true
src/Dash/main.cpp+9−7
@@ -91,7 +91,7 @@ int main(int argc, const char *argv[])
91 }
91 }
92 #endif
92 #endif
93
93
94− QQmlApplicationEngine engine;
94+ QQmlApplicationEngine *engine = new QQmlApplicationEngine(application);
95
95
96 int initialWidth = -1;
96 int initialWidth = -1;
97 int initialHeight = -1;
97 int initialHeight = -1;
@@ -105,20 +105,22 @@ int main(int argc, const char *argv[])
105 initialHeight = windowSize.height();
105 initialHeight = windowSize.height();
106 }
106 }
107 }
107 }
108− engine.rootContext()->setContextProperty("initialWidth", initialWidth);
108+ engine->rootContext()->setContextProperty("initialWidth", initialWidth);
109− engine.rootContext()->setContextProperty("initialHeight", initialHeight);
109+ engine->rootContext()->setContextProperty("initialHeight", initialHeight);
110
110
111 QUrl source(::qmlDirectory() + "/Dash/DashApplication.qml");
111 QUrl source(::qmlDirectory() + "/Dash/DashApplication.qml");
112− prependImportPaths(&engine, ::overrideImportPaths());
112+ prependImportPaths(engine, ::overrideImportPaths());
113− appendImportPaths(&engine, ::fallbackImportPaths());
113+ appendImportPaths(engine, ::fallbackImportPaths());
114
114
115 CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();
115 CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();
116− engine.setNetworkAccessManagerFactory(managerFactory);
116+ engine->setNetworkAccessManagerFactory(managerFactory);
117
117
118− engine.load(source);
118+ engine->load(source);
119
119
120 int result = application->exec();
120 int result = application->exec();
121
121
122+ delete engine;
123+
122 #ifdef UNITY8_ENABLE_TOUCH_EMULATION
124 #ifdef UNITY8_ENABLE_TOUCH_EMULATION
123 delete mouseTouchAdaptor;
125 delete mouseTouchAdaptor;
124 #endif
126 #endif