a53d880 · unity8 · git.iko.soy

git.iko.soy/unity8

fix crashiness on exit

commita53d88098258e939115377909f90a138e8601d2d authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 23 May 2016, 12:45 (10 years ago) parent823c595

2 files changed+10−8

compare with xenial

unifiedsplit

qml/Dash/DashApplication.qml+1−1 src/Dash/main.cpp+9−7

qml/Dash/DashApplication.qml+1−1

@@ -15,9 +15,9 @@

1515 */

1616

1717import QtQuick 2.4

18+import QtQuick.Window 2.2

1819import Ubuntu.Components 1.3

1920import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/

20−import QtQuick.Window 2.2

2121

2222Window {

2323 visible: true

src/Dash/main.cpp+9−7

@@ -91,7 +91,7 @@ int main(int argc, const char *argv[])

9191 }

9292 #endif

9393

94− QQmlApplicationEngine engine;

94+ QQmlApplicationEngine *engine = new QQmlApplicationEngine(application);

9595

9696 int initialWidth = -1;

9797 int initialHeight = -1;

@@ -105,20 +105,22 @@ int main(int argc, const char *argv[])

105105 initialHeight = windowSize.height();

106106 }

107107 }

108− engine.rootContext()->setContextProperty("initialWidth", initialWidth);

109− engine.rootContext()->setContextProperty("initialHeight", initialHeight);

108+ engine->rootContext()->setContextProperty("initialWidth", initialWidth);

109+ engine->rootContext()->setContextProperty("initialHeight", initialHeight);

110110

111111 QUrl source(::qmlDirectory() + "/Dash/DashApplication.qml");

112− prependImportPaths(&engine, ::overrideImportPaths());

113− appendImportPaths(&engine, ::fallbackImportPaths());

112+ prependImportPaths(engine, ::overrideImportPaths());

113+ appendImportPaths(engine, ::fallbackImportPaths());

114114

115115 CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();

116− engine.setNetworkAccessManagerFactory(managerFactory);

116+ engine->setNetworkAccessManagerFactory(managerFactory);

117117

118− engine.load(source);

118+ engine->load(source);

119119

120120 int result = application->exec();

121121

122+ delete engine;

123+

122124 #ifdef UNITY8_ENABLE_TOUCH_EMULATION

123125 delete mouseTouchAdaptor;

124126 #endif