@@ -27,7 +27,7 @@ inline QString installRoot() {
2727 static QString installRoot;
2828 static bool installRootSet = false;
2929 if (!installRootSet) {
30− QString snapRoot = qgetenv("SNAP");
30+ QString snapRoot = QFile::decodeName(qgetenv("SNAP"));
3131 if (QCoreApplication::applicationDirPath() ==
3232 QDir(snapRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {
3333 installRoot = snapRoot;
@@ -58,7 +58,7 @@ inline QString translationDirectory() {
5858 if (isRunningInstalled()) {
5959 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
6060 } else {
61− return QString(buildDirectory() + "/po/locale");
61+ return buildDirectory() + QStringLiteral("/po/locale");
6262 }
6363}
6464
@@ -66,14 +66,14 @@ inline QString qmlDirectory() {
6666 if (isRunningInstalled()) {
6767 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
6868 } else {
69− return QString(sourceDirectory() + "/qml");
69+ return sourceDirectory() + QStringLiteral("/qml");
7070 }
7171}
7272
7373inline QStringList overrideImportPaths() {
7474 QStringList paths;
7575 if (!isRunningInstalled()) {
76− paths << QString(buildDirectory() + "/plugins");
76+ paths << buildDirectory() + QStringLiteral("/plugins");
7777 }
7878 return paths;
7979}
@@ -83,7 +83,7 @@ inline QStringList nonMirImportPaths() {
8383 if (isRunningInstalled()) {
8484 paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
8585 } else {
86− paths << QString(buildDirectory() + "/nonmirplugins");
86+ paths << buildDirectory() + QStringLiteral("/nonmirplugins");
8787 }
8888 return paths;
8989}
@@ -98,7 +98,7 @@ inline QStringList fallbackImportPaths() {
9898 } else {
9999 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
100100 paths << QStringLiteral("@SHELL_PLUGINDIR@");
101− paths << QString(buildDirectory() + "/tests/mocks");
101+ paths << buildDirectory() + QStringLiteral("/tests/mocks");
102102 }
103103 return paths;
104104}
@@ -107,7 +107,7 @@ inline QString mockPluginsDir() {
107107 if (isRunningInstalled()) {
108108 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
109109 } else {
110− return QString(buildDirectory() + "/tests/mocks");
110+ return buildDirectory() + QStringLiteral("/tests/mocks");
111111 }
112112}
113113