git.iko.soy/unity8
on xenial help sign in
Fix static QString usage
d74a465Michael Terry
include/paths.h.in+15−13
compare with xenial
unifiedsplit
@@ -23,9 +23,8 @@
23#include <QtQml/QQmlEngine>
23#include <QtQml/QQmlEngine>
24#include <QStandardPaths>
24#include <QStandardPaths>
25
25
26−static QString installRoot;
26+inline QString installRoot() {
27−
27+ static QString installRoot;
28−inline bool isRunningInstalled() {
29 static bool installRootSet = false;
28 static bool installRootSet = false;
30 if (!installRootSet) {
29 if (!installRootSet) {
31 QString snapRoot = qgetenv("SNAP");
30 QString snapRoot = qgetenv("SNAP");
@@ -38,8 +37,11 @@ inline bool isRunningInstalled() {
38 }
37 }
39 installRootSet = true;
38 installRootSet = true;
40 }
39 }
41−qWarning() << "MIKE isRunningInstalled?" << installRootSet << installRoot << !installRoot.isNull() << snapRoot;
40+ return installRoot;
41+}
42+
43+inline bool isRunningInstalled() {
42− return !installRoot.isNull();
44+ return !installRoot().isNull();
43}
45}
44
46
45inline QString buildDirectory() {
47inline QString buildDirectory() {
@@ -54,7 +56,7 @@ inline QString sourceDirectory() {
54
56
55inline QString translationDirectory() {
57inline QString translationDirectory() {
56 if (isRunningInstalled()) {
58 if (isRunningInstalled()) {
57− return installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
59+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
58 } else {
60 } else {
59 return QString(buildDirectory() + "/po/locale");
61 return QString(buildDirectory() + "/po/locale");
60 }
62 }
@@ -62,7 +64,7 @@ inline QString translationDirectory() {
62
64
63inline QString qmlDirectory() {
65inline QString qmlDirectory() {
64 if (isRunningInstalled()) {
66 if (isRunningInstalled()) {
65− return installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
67+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
66 } else {
68 } else {
67 return QString(sourceDirectory() + "/qml");
69 return QString(sourceDirectory() + "/qml");
68 }
70 }
@@ -79,7 +81,7 @@ inline QStringList overrideImportPaths() {
79inline QStringList nonMirImportPaths() {
81inline QStringList nonMirImportPaths() {
80 QStringList paths;
82 QStringList paths;
81 if (isRunningInstalled()) {
83 if (isRunningInstalled()) {
82− paths << installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
84+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
83 } else {
85 } else {
84 paths << QString(buildDirectory() + "/nonmirplugins");
86 paths << QString(buildDirectory() + "/nonmirplugins");
85 }
87 }
@@ -89,10 +91,10 @@ inline QStringList nonMirImportPaths() {
89inline QStringList fallbackImportPaths() {
91inline QStringList fallbackImportPaths() {
90 QStringList paths;
92 QStringList paths;
91 if (isRunningInstalled()) {
93 if (isRunningInstalled()) {
92− paths << installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
94+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
93− paths << installRoot + QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
95+ paths << installRoot() + QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
94− paths << installRoot + QStringLiteral("@SHELL_PLUGINDIR@");
96+ paths << installRoot() + QStringLiteral("@SHELL_PLUGINDIR@");
95− paths << installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
97+ paths << installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
96 } else {
98 } else {
97 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
99 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
98 paths << QStringLiteral("@SHELL_PLUGINDIR@");
100 paths << QStringLiteral("@SHELL_PLUGINDIR@");
@@ -103,7 +105,7 @@ inline QStringList fallbackImportPaths() {
103
105
104inline QString mockPluginsDir() {
106inline QString mockPluginsDir() {
105 if (isRunningInstalled()) {
107 if (isRunningInstalled()) {
106− return installRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
108+ return installRoot() + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
107 } else {
109 } else {
108 return QString(buildDirectory() + "/tests/mocks");
110 return QString(buildDirectory() + "/tests/mocks");
109 }
111 }