git.iko.soy/unity8
on xenial help sign in
skip the reporting page if the system if configured not to report crashes
fc8192eLukáš Tinkl
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.2 REQUIRED)
57find_package(Qt5Concurrent 5.2 REQUIRED)
57find_package(Qt5Concurrent 5.2 REQUIRED)
58find_package(Qt5Sql 5.2 REQUIRED)
58find_package(Qt5Sql 5.2 REQUIRED)
59
59
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=8)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=8)
61
61
62# Standard install paths
62# Standard install paths
63include(GNUInstallDirs)
63include(GNUInstallDirs)
qml/Wizard/Pages/60-reporting.qml+7
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19+import Ubuntu.SystemSettings.Diagnostics 1.0
19import ".." as LocalComponents
20import ".." as LocalComponents
20
21
21LocalComponents.Page {
22LocalComponents.Page {
@@ -24,6 +25,12 @@ LocalComponents.Page {
24 title: i18n.tr("Improving your experience")
25 title: i18n.tr("Improving your experience")
25 forwardButtonSourceComponent: forwardButton
26 forwardButtonSourceComponent: forwardButton
26
27
28+ skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes
29+
30+ UbuntuDiagnostics {
31+ id: diagnostics
32+ }
33+
27 Column {
34 Column {
28 id: column
35 id: column
29 anchors.fill: content
36 anchors.fill: content