git.iko.soy/unity8
on xenial help sign in
UITK overrides the icon theme anyway, so drop code handling that in unity8.
commit5b78fa60a36ec6bb894bc8cdc769fb8d2ea62677 authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 17 Mar 2014, 15:27 (13 years ago) parentb9bc8a3
4 files changed+2−18
compare with xenial
unifiedsplit
cmake/modules/autopilot.cmake+2−2 include/paths.h.in−8 run−6 src/main.cpp−2
cmake/modules/autopilot.cmake+2−2
@@ -2,7 +2,7 @@ add_custom_target(autopilot)
22
33function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
44 add_custom_target(autopilot-${TEST_NAME}
5− COMMAND LANG=C UBUNTU_ICON_THEME=suru QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
5+ COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}
66 WORKING_DIRECTORY ${WORKING_DIR}
77 DEPENDS fake_install
88 )
@@ -14,7 +14,7 @@ function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
1414 add_dependencies(autopilot autopilot-${TEST_NAME})
1515
1616 add_custom_target(autopilot2-${TEST_NAME}
17− COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
17+ COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
1818 WORKING_DIRECTORY ${WORKING_DIR}
1919 DEPENDS fake_install
2020 )
include/paths.h.in−8
@@ -117,12 +117,4 @@ inline void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
117117 engine->setImportPathList(importPathList);
118118}
119119
120−inline void resolveIconTheme() {
121− const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");
122− if (ubuntuIconTheme == NULL) {
123− ubuntuIconTheme = "suru";
124− }
125− QIcon::setThemeName(ubuntuIconTheme);
126−}
127−
128120#endif
run−6
@@ -57,12 +57,6 @@ if $KEYLOCK; then
5757 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
5858fi
5959
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
62−if [ -n "$DESKTOP_SESSION" ]; then
63− export UBUNTU_ICON_THEME=suru
64−fi
65−
6660QML_PHONE_SHELL_ARGS=""
6761if $MOUSE_TOUCH; then
6862 QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"
src/main.cpp−2
@@ -64,8 +64,6 @@ int startShell(int argc, const char** argv, void* server)
6464 indicatorProfile = "phone";
6565 }
6666
67− resolveIconTheme();
68−
6967 QStringList args = application->arguments();
7068 ApplicationArguments qmlArgs(args);
7169