git.iko.soy/unity8
on xenial help sign in
Merge from trunk
commitbb6e493c74cc251bf17ca70e37e9e68c19f55b7f authorMichael Terry <michael.terry@canonical.com> dateMon 5 Oct 2015, 17:04 (11 years ago) parent60842cfe46cde1
5 files changed+36−14
compare with xenial
unifiedsplit
CMakeLists.txt+1−1 debian/changelog+11 po/ug.po+1−1 qml/Wizard/Pages/60-reporting.qml+10 tests/qmltests/Wizard/tst_Wizard.qml+13−12
CMakeLists.txt+1−1
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.2 REQUIRED)
5757find_package(Qt5Concurrent 5.2 REQUIRED)
5858find_package(Qt5Sql 5.2 REQUIRED)
5959
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=8)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=8)
6161
6262# Standard install paths
6363include(GNUInstallDirs)
debian/changelog+11
@@ -1,3 +1,14 @@
1+unity8 (8.11+15.10.20151002-0ubuntu1) wily; urgency=medium
2+
3+ [ CI Train Bot ]
4+ * Resync trunk.
5+
6+ [ Lukáš Tinkl ]
7+ * Wizard: skip the reporting page if the system is configured not to
8+ report crashes (LP: #1494442)
9+
10+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 02 Oct 2015 13:24:03 +0000
11+
112unity8 (8.11+15.10.20151001-0ubuntu1) wily; urgency=medium
213
314 [ Alexandros Frantzis ]
po/ug.po+1−1
@@ -15,7 +15,7 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-10-02 05:47+0000\n"
18+"X-Launchpad-Export-Date: 2015-10-03 05:40+0000\n"
1919"X-Generator: Launchpad (build 17783)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
qml/Wizard/Pages/60-reporting.qml+10
@@ -16,14 +16,24 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19+import Ubuntu.SystemSettings.Diagnostics 1.0
1920import ".." as LocalComponents
2021
2122LocalComponents.Page {
23+ id: reportingPage
2224 objectName: "reportingPage"
2325
2426 title: i18n.tr("Improving your experience")
2527 forwardButtonSourceComponent: forwardButton
2628
29+ skipValid: false
30+ skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes
31+
32+ UbuntuDiagnostics {
33+ id: diagnostics
34+ Component.onCompleted: reportingPage.skipValid = true;
35+ }
36+
2737 Column {
2838 id: column
2939 anchors.fill: content
tests/qmltests/Wizard/tst_Wizard.qml+13−12
@@ -158,13 +158,16 @@ Item {
158158 return stack.currentPage;
159159 }
160160
161− function goToPage(name, skipSim, skipLocation) {
161+ function goToPage(name, skipSim, skipLocation, skipReporting) {
162162 if (skipSim === undefined) {
163163 skipSim = false;
164164 }
165165 if (skipLocation === undefined) {
166166 skipLocation = false;
167167 }
168+ if (skipReporting === undefined) {
169+ skipReporting = false;
170+ }
168171
169172 var page = waitForPage("languagePage");
170173 if (name === page.objectName) return page;
@@ -191,9 +194,11 @@ Item {
191194 tap(findChild(page, "forwardButton"));
192195 }
193196
194− page = waitForPage("reportingPage");
195− if (name === page.objectName) return page;
196− tap(findChild(page, "forwardButton"));
197+ if (!skipReporting) {
198+ page = waitForPage("reportingPage");
199+ if (name === page.objectName) return page;
200+ tap(findChild(page, "forwardButton"));
201+ }
197202
198203 page = waitForPage("finishedPage");
199204 if (name === page.objectName) return page;
@@ -337,8 +342,6 @@ Item {
337342 tap(findChild(page, "forwardButton"));
338343 page = waitForPage("locationPage");
339344 tap(findChild(page, "forwardButton"));
340− page = waitForPage("reportingPage");
341− tap(findChild(page, "forwardButton"));
342345 page = waitForPage("finishedPage");
343346 tap(findChild(page, "forwardButton"));
344347
@@ -390,8 +393,6 @@ Item {
390393 tap(findChild(page, "forwardButton"));
391394 page = waitForPage("locationPage");
392395 tap(findChild(page, "forwardButton"));
393− page = waitForPage("reportingPage");
394− tap(findChild(page, "forwardButton"));
395396 page = waitForPage("finishedPage");
396397 tap(findChild(page, "forwardButton"));
397398
@@ -402,7 +403,7 @@ Item {
402403 }
403404
404405 function test_passwdSwipe() {
405− goToPage(null);
406+ goToPage(null, false, false, true);
406407
407408 tryCompare(setSecuritySpy, "count", 1);
408409 compare(setSecuritySpy.signalArguments[0][0], "");
@@ -412,12 +413,12 @@ Item {
412413
413414 function test_locationSkipNoPath() {
414415 AccountsService.hereLicensePath = "";
415− goToPage("reportingPage", false, true);
416+ goToPage("finishedPage", false, true, true);
416417 }
417418
418419 function test_locationSkipNoFiles() {
419420 AccountsService.hereLicensePath = Qt.resolvedUrl("nolicenses");
420− goToPage("reportingPage", false, true);
421+ goToPage("finishedPage", false, true, true);
421422 }
422423
423424 function test_locationWaitOnPath() {
@@ -434,7 +435,7 @@ Item {
434435 compare(stack.currentPage.skipValid, false);
435436
436437 AccountsService.hereLicensePath = "";
437− waitForPage("reportingPage");
438+ waitForPage("finishedPage", false, false, true);
438439 }
439440
440441 function test_locationGpsOnly() {