git.iko.soy/unity8
on xenial help sign in
Add missing dep and fix AS mock to allow setting null license path
47d4e01Michael Terry
debian/control+2
compare with xenial
unifiedsplit
@@ -48,6 +48,7 @@ Build-Depends: cmake,
48 qtdeclarative5-qtmultimedia-plugin,
48 qtdeclarative5-qtmultimedia-plugin,
49 qtdeclarative5-ubuntu-settings-components (>= 0.4),
49 qtdeclarative5-ubuntu-settings-components (>= 0.4),
50 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
50 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
51+ qtdeclarative5-ubuntu-web-plugin,
51 ttf-ubuntu-font-family,
52 ttf-ubuntu-font-family,
52Standards-Version: 3.9.4
53Standards-Version: 3.9.4
53Homepage: http://launchpad.net/unity
54Homepage: http://launchpad.net/unity
@@ -90,6 +91,7 @@ Depends: gsettings-desktop-schemas,
90 qtdeclarative5-gsettings1.0,
91 qtdeclarative5-gsettings1.0,
91 qtdeclarative5-qtmir-plugin (>= 0.4.4),
92 qtdeclarative5-qtmir-plugin (>= 0.4.4),
92 qtdeclarative5-ubuntu-telephony0.1,
93 qtdeclarative5-ubuntu-telephony0.1,
94+ qtdeclarative5-ubuntu-web-plugin,
93 ubuntu-system-settings,
95 ubuntu-system-settings,
94 unity-launcher-impl-4,
96 unity-launcher-impl-4,
95 unity8-common (= ${source:Version}),
97 unity8-common (= ${source:Version}),
tests/mocks/AccountsService/AccountsService.cpp+7−1
@@ -138,7 +138,13 @@ QString AccountsService::hereLicensePath() const
138void AccountsService::setHereLicensePath(const QString &path)
138void AccountsService::setHereLicensePath(const QString &path)
139{
139{
140 // Path should always be valid (this code is all synchronous)
140 // Path should always be valid (this code is all synchronous)
141+ if (path == " ") {
141− m_hereLicensePath = path.isNull() ? "" : path;
142+ m_hereLicensePath = QString::null;
143+ } else if (path.isNull()) { // because qml collapses null and empty
144+ m_hereLicensePath = "";
145+ } else {
146+ m_hereLicensePath = path;
147+ }
142 hereLicensePathChanged();
148 hereLicensePathChanged();
143}
149}
144
150