git.iko.soy/unity8
on xenial help sign in
UITK overrides the icon theme anyway, so drop code handling that in unity8.
5b78fa6Michał Sawicz
cmake/modules/autopilot.cmake+2−2
compare with xenial
unifiedsplit
@@ -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=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}
6 WORKING_DIRECTORY ${WORKING_DIR}
6 WORKING_DIRECTORY ${WORKING_DIR}
7 DEPENDS fake_install
7 DEPENDS fake_install
8 )
8 )
@@ -14,7 +14,7 @@ function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
14 add_dependencies(autopilot autopilot-${TEST_NAME})
14 add_dependencies(autopilot autopilot-${TEST_NAME})
15
15
16 add_custom_target(autopilot2-${TEST_NAME}
16 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}
18 WORKING_DIRECTORY ${WORKING_DIR}
18 WORKING_DIRECTORY ${WORKING_DIR}
19 DEPENDS fake_install
19 DEPENDS fake_install
20 )
20 )
include/paths.h.in−8
@@ -117,12 +117,4 @@ inline void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
117 engine->setImportPathList(importPathList);
117 engine->setImportPathList(importPathList);
118}
118}
119
119
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−
128#endif
120#endif
run−6
@@ -57,12 +57,6 @@ if $KEYLOCK; then
57 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
57 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
58fi
58fi
59
59
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−
66QML_PHONE_SHELL_ARGS=""
60QML_PHONE_SHELL_ARGS=""
67if $MOUSE_TOUCH; then
61if $MOUSE_TOUCH; then
68 QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"
62 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)
64 indicatorProfile = "phone";
64 indicatorProfile = "phone";
65 }
65 }
66
66
67− resolveIconTheme();
68−
69 QStringList args = application->arguments();
67 QStringList args = application->arguments();
70 ApplicationArguments qmlArgs(args);
68 ApplicationArguments qmlArgs(args);
71
69