1da95d4 · unity8 · git.iko.soy

on xenial help sign in

Fall back to "ubuntu-mobile" icon theme if $UBUNTU_ICON_THEME is unset

1da95d4Lars Uebernickel13 years ago

debian/control+1

@@ -42,6 +42,7 @@ Build-Depends: cmake,

42 qtdeclarative5-ubuntu-ui-toolkit-plugin,

43 qtdeclarative5-xmllistmodel-plugin,

44 ttf-ubuntu-font-family,

45+ ubuntu-mobile-icons,

45Standards-Version: 3.9.4

46Standards-Version: 3.9.4

46Homepage: http://launchpad.net/unity

47Homepage: http://launchpad.net/unity

47# If you aren't a member of ~unity-team but need to upload

48# If you aren't a member of ~unity-team but need to upload

main.cpp+3−2

@@ -65,9 +65,10 @@ void appendImportPaths(QQmlEngine *engine, const QStringList &paths)

66void resolveIconTheme() {

67 const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");

68− if (ubuntuIconTheme != NULL) {

68+ if (ubuntuIconTheme == NULL) {

69− QIcon::setThemeName(ubuntuIconTheme);

69+ ubuntuIconTheme = "ubuntu-mobile";

70 }

71+ QIcon::setThemeName(ubuntuIconTheme);

71}

72}

72} // namespace {

73} // namespace {