git.iko.soy/unity8
on xenial help sign in
switch the default theme to suru
7eecbc6Didier Roche
build+1−1
compare with xenial
unifiedsplit
@@ -48,7 +48,7 @@ install_dependencies() {
48 qtdeclarative5-ubuntu-settings-components \
48 qtdeclarative5-ubuntu-settings-components \
49 unity-notifications-impl \
49 unity-notifications-impl \
50 qtdeclarative5-xmllistmodel-plugin \
50 qtdeclarative5-xmllistmodel-plugin \
51− ubuntu-mobile-icons \
51+ suru-icon-theme \
52 unity-scope-home \
52 unity-scope-home \
53 unity-lens-applications \
53 unity-lens-applications \
54 unity-plugin-scopes \
54 unity-plugin-scopes \
cmake/modules/autopilot.cmake+1−1
@@ -2,7 +2,7 @@ add_custom_target(autopilot)
2
2
3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
4 add_custom_target(autopilot-${TEST_NAME}
4 add_custom_target(autopilot-${TEST_NAME}
5− COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks autopilot run ${TEST_SUITE}
5+ COMMAND LANG=C UBUNTU_ICON_THEME=suru QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks autopilot run ${TEST_SUITE}
6 WORKING_DIRECTORY ${WORKING_DIR}
6 WORKING_DIRECTORY ${WORKING_DIR}
7 DEPENDS fake_install
7 DEPENDS fake_install
8 )
8 )
include/paths.h.in+1−1
@@ -120,7 +120,7 @@ inline void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
120inline void resolveIconTheme() {
120inline void resolveIconTheme() {
121 const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");
121 const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");
122 if (ubuntuIconTheme == NULL) {
122 if (ubuntuIconTheme == NULL) {
123− ubuntuIconTheme = "ubuntu-mobile";
123+ ubuntuIconTheme = "suru";
124 }
124 }
125 QIcon::setThemeName(ubuntuIconTheme);
125 QIcon::setThemeName(ubuntuIconTheme);
126}
126}
run+1−1
@@ -60,7 +60,7 @@ fi
60# Force icon theme if running on the desktop, otherwise gnome theme (if running
60# Force icon theme if running on the desktop, otherwise gnome theme (if running
61# on Ubuntu Desktop) will be used and icons won't be found
61# on Ubuntu Desktop) will be used and icons won't be found
62if [ -n "$DESKTOP_SESSION" ]; then
62if [ -n "$DESKTOP_SESSION" ]; then
63− export UBUNTU_ICON_THEME=ubuntu-mobile
63+ export UBUNTU_ICON_THEME=suru
64fi
64fi
65
65
66QML_PHONE_SHELL_ARGS=""
66QML_PHONE_SHELL_ARGS=""