@@ -27,7 +27,7 @@ inline QString installRoot() {
27 static QString installRoot;
27 static QString installRoot;
28 static bool installRootSet = false;
28 static bool installRootSet = false;
29 if (!installRootSet) {
29 if (!installRootSet) {
30− QString snapRoot = qgetenv("SNAP");
30+ QString snapRoot = QFile::decodeName(qgetenv("SNAP"));
31 if (QCoreApplication::applicationDirPath() ==
31 if (QCoreApplication::applicationDirPath() ==
32 QDir(snapRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {
32 QDir(snapRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {
33 installRoot = snapRoot;
33 installRoot = snapRoot;
@@ -58,7 +58,7 @@ inline QString translationDirectory() {
58 if (isRunningInstalled()) {
58 if (isRunningInstalled()) {
59 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
59 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
61− return QString(buildDirectory() + "/po/locale");
61+ return buildDirectory() + QStringLiteral("/po/locale");
@@ -66,14 +66,14 @@ inline QString qmlDirectory() {
66 if (isRunningInstalled()) {
66 if (isRunningInstalled()) {
67 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
67 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
69− return QString(sourceDirectory() + "/qml");
69+ return sourceDirectory() + QStringLiteral("/qml");
73inline QStringList overrideImportPaths() {
73inline QStringList overrideImportPaths() {
74 QStringList paths;
74 QStringList paths;
75 if (!isRunningInstalled()) {
75 if (!isRunningInstalled()) {
76− paths << QString(buildDirectory() + "/plugins");
76+ paths << buildDirectory() + QStringLiteral("/plugins");
78 return paths;
78 return paths;
@@ -83,7 +83,7 @@ inline QStringList nonMirImportPaths() {
83 if (isRunningInstalled()) {
83 if (isRunningInstalled()) {
84 paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
84 paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
86− paths << QString(buildDirectory() + "/nonmirplugins");
86+ paths << buildDirectory() + QStringLiteral("/nonmirplugins");
88 return paths;
88 return paths;
@@ -98,7 +98,7 @@ inline QStringList fallbackImportPaths() {
99 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
99 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
100 paths << QStringLiteral("@SHELL_PLUGINDIR@");
100 paths << QStringLiteral("@SHELL_PLUGINDIR@");
101− paths << QString(buildDirectory() + "/tests/mocks");
101+ paths << buildDirectory() + QStringLiteral("/tests/mocks");
103 return paths;
103 return paths;
@@ -107,7 +107,7 @@ inline QString mockPluginsDir() {
107 if (isRunningInstalled()) {
107 if (isRunningInstalled()) {
108 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
108 return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
110− return QString(buildDirectory() + "/tests/mocks");
110+ return buildDirectory() + QStringLiteral("/tests/mocks");