on xenial help sign in
Further hail-Mary hotfix
commit2ff32aebdc7e7d929410a101aa2978f448f736ed authorMichael Terry <michael.terry@canonical.com> dateFri 18 Mar 2016, 16:01 (11 years ago) parent29849b8
2 files changed+27−2
qml/Wizard/DelayedWebView.qml+26 qml/Wizard/Pages/75-report-check.qml+1−2
qml/Wizard/DelayedWebView.qmlnew file+26
@@ -0,0 +1,26 @@
1+/*
2+ * Copyright (C) 2016 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.4
18+import Ubuntu.Web 0.2
19+
20+// FIXME: we use this separate file to avoid import Ubuntu.Web, because we're
21+// seeing freezes in unity8 after the wizard shuts down, seemingly due to oxide?
22+// So for now, as a hotfix, we only load the webview when necessary.
23+// Also see Wizard.qml, where we avoid unloading the wizard at all for
24+// similar mitigation reasons while we root-cause the problem.
25+WebView {
26+}
qml/Wizard/Pages/75-report-check.qml+1−2
@@ -16,7 +16,6 @@
1616
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
19−import Ubuntu.Web 0.2
2019import ".." as LocalComponents
2120
2221LocalComponents.Page {
@@ -82,7 +81,7 @@ LocalComponents.Page {
8281 visible: false
8382 active: false
8483 property string url
85− sourceComponent: WebView {
84+ sourceComponent: LocalComponents.DelayedWebView {
8685 objectName: "webview"
8786 url: webview.url
8887 }