git.iko.soy/unity8
on xenial help sign in
Add missing dep and fix AS mock to allow setting null license path
commit47d4e01b349e806377ad27117e22978590488cab authorMichael Terry <michael.terry@canonical.com> dateWed 3 Dec 2014, 12:22 (12 years ago) parent8a07d34
2 files changed+9−1
compare with xenial
unifiedsplit
debian/control+2 tests/mocks/AccountsService/AccountsService.cpp+7−1
debian/control+2
@@ -48,6 +48,7 @@ Build-Depends: cmake,
4848 qtdeclarative5-qtmultimedia-plugin,
4949 qtdeclarative5-ubuntu-settings-components (>= 0.4),
5050 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
51+ qtdeclarative5-ubuntu-web-plugin,
5152 ttf-ubuntu-font-family,
5253Standards-Version: 3.9.4
5354Homepage: http://launchpad.net/unity
@@ -90,6 +91,7 @@ Depends: gsettings-desktop-schemas,
9091 qtdeclarative5-gsettings1.0,
9192 qtdeclarative5-qtmir-plugin (>= 0.4.4),
9293 qtdeclarative5-ubuntu-telephony0.1,
94+ qtdeclarative5-ubuntu-web-plugin,
9395 ubuntu-system-settings,
9496 unity-launcher-impl-4,
9597 unity8-common (= ${source:Version}),
tests/mocks/AccountsService/AccountsService.cpp+7−1
@@ -138,7 +138,13 @@ QString AccountsService::hereLicensePath() const
138138void AccountsService::setHereLicensePath(const QString &path)
139139{
140140 // Path should always be valid (this code is all synchronous)
141− m_hereLicensePath = path.isNull() ? "" : path;
141+ if (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+ }
142148 hereLicensePathChanged();
143149}
144150