@@ -23,9 +23,8 @@
2323#include <QtQml/QQmlEngine>
2424#include <QStandardPaths>
2525
26−static QString installRoot;
27−
28−inline bool isRunningInstalled() {
26+inline QString installRoot() {
27+ static QString installRoot;
2928 static bool installRootSet = false;
3029 if (!installRootSet) {
3130 QString snapRoot = qgetenv("SNAP");
@@ -38,8 +37,11 @@ inline bool isRunningInstalled() {
3837 }
3938 installRootSet = true;
4039 }
41−qWarning() << "MIKE isRunningInstalled?" << installRootSet << installRoot << !installRoot.isNull() << snapRoot;
42− return !installRoot.isNull();
40+ return installRoot;
41+}
42+
43+inline bool isRunningInstalled() {
44+ return !installRoot().isNull();
4345}
4446
4547inline QString buildDirectory() {
@@ -54,7 +56,7 @@ inline QString sourceDirectory() {
5456
5557inline QString translationDirectory() {
5658 if (isRunningInstalled()) {
57− return installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
59+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
5860 } else {
5961 return QString(buildDirectory() + "/po/locale");
6062 }
@@ -62,7 +64,7 @@ inline QString translationDirectory() {
6264
6365inline QString qmlDirectory() {
6466 if (isRunningInstalled()) {
65− return installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
67+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
6668 } else {
6769 return QString(sourceDirectory() + "/qml");
6870 }
@@ -79,7 +81,7 @@ inline QStringList overrideImportPaths() {
7981inline QStringList nonMirImportPaths() {
8082 QStringList paths;
8183 if (isRunningInstalled()) {
82− paths << installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
84+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
8385 } else {
8486 paths << QString(buildDirectory() + "/nonmirplugins");
8587 }
@@ -89,10 +91,10 @@ inline QStringList nonMirImportPaths() {
8991inline QStringList fallbackImportPaths() {
9092 QStringList paths;
9193 if (isRunningInstalled()) {
92− paths << installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
93− paths << installRoot + QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
94− paths << installRoot + QStringLiteral("@SHELL_PLUGINDIR@");
95− paths << installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
94+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
95+ paths << installRoot() + QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
96+ paths << installRoot() + QStringLiteral("@SHELL_PLUGINDIR@");
97+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
9698 } else {
9799 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
98100 paths << QStringLiteral("@SHELL_PLUGINDIR@");
@@ -103,7 +105,7 @@ inline QStringList fallbackImportPaths() {
103105
104106inline QString mockPluginsDir() {
105107 if (isRunningInstalled()) {
106− return installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
108+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
107109 } else {
108110 return QString(buildDirectory() + "/tests/mocks");
109111 }