git.iko.soy/unity8
on xenial help sign in
Forgot to commit this change
5b4dee9Albert Astals Cid
include/paths.h.in+18−18
compare with xenial
unifiedsplit
@@ -29,30 +29,30 @@
29
29
30inline bool isRunningInstalled() {
30inline bool isRunningInstalled() {
31 static bool installed = (QCoreApplication::applicationDirPath() ==
31 static bool installed = (QCoreApplication::applicationDirPath() ==
32− QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
32+ QDir(QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
33 return installed;
33 return installed;
34}
34}
35
35
36inline QString translationDirectory() {
36inline QString translationDirectory() {
37 if (isRunningInstalled()) {
37 if (isRunningInstalled()) {
38− return QString("@CMAKE_INSTALL_PREFIX@/share/locale");
38+ return QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");
39 } else {
39 } else {
40− return QString("@CMAKE_BINARY_DIR@/po/locale");
40+ return QStringLiteral("@CMAKE_BINARY_DIR@/po/locale");
41 }
41 }
42}
42}
43
43
44inline QString qmlDirectory() {
44inline QString qmlDirectory() {
45 if (isRunningInstalled()) {
45 if (isRunningInstalled()) {
46− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
46+ return QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
47 } else {
47 } else {
48− return QString("@CMAKE_SOURCE_DIR@/qml/");
48+ return QStringLiteral("@CMAKE_SOURCE_DIR@/qml/");
49 }
49 }
50}
50}
51
51
52inline QStringList overrideImportPaths() {
52inline QStringList overrideImportPaths() {
53 QStringList paths;
53 QStringList paths;
54 if (!isRunningInstalled()) {
54 if (!isRunningInstalled()) {
55− paths << QString("@CMAKE_BINARY_DIR@/plugins");
55+ paths << QStringLiteral("@CMAKE_BINARY_DIR@/plugins");
56 }
56 }
57 return paths;
57 return paths;
58}
58}
@@ -60,9 +60,9 @@ inline QStringList overrideImportPaths() {
60inline QStringList nonMirImportPaths() {
60inline QStringList nonMirImportPaths() {
61 QStringList paths;
61 QStringList paths;
62 if (isRunningInstalled()) {
62 if (isRunningInstalled()) {
63− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
63+ paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
64 } else {
64 } else {
65− paths << QString("@CMAKE_BINARY_DIR@/nonmirplugins");
65+ paths << QStringLiteral("@CMAKE_BINARY_DIR@/nonmirplugins");
66 }
66 }
67 return paths;
67 return paths;
68}
68}
@@ -70,23 +70,23 @@ inline QStringList nonMirImportPaths() {
70inline QStringList fallbackImportPaths() {
70inline QStringList fallbackImportPaths() {
71 QStringList paths;
71 QStringList paths;
72 if (isRunningInstalled()) {
72 if (isRunningInstalled()) {
73− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
73+ paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
74− paths << QString("@USS_PRIVATE_PLUGINDIR@");
74+ paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
75− paths << QString("@SHELL_PLUGINDIR@");
75+ paths << QStringLiteral("@SHELL_PLUGINDIR@");
76− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
76+ paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
77 } else {
77 } else {
78− paths << QString("@USS_PRIVATE_PLUGINDIR@");
78+ paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");
79− paths << QString("@SHELL_PLUGINDIR@");
79+ paths << QStringLiteral("@SHELL_PLUGINDIR@");
80− paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
80+ paths << QStringLiteral("@CMAKE_BINARY_DIR@/tests/mocks");
81 }
81 }
82 return paths;
82 return paths;
83}
83}
84
84
85inline QString mockPluginsDir() {
85inline QString mockPluginsDir() {
86 if (isRunningInstalled()) {
86 if (isRunningInstalled()) {
87− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
87+ return QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
88 } else {
88 } else {
89− return QString("@CMAKE_BINARY_DIR@/tests/mocks");
89+ return QStringLiteral("@CMAKE_BINARY_DIR@/tests/mocks");
90 }
90 }
91}
91}
92
92
@@ -100,7 +100,7 @@ inline QStringList shellDataDirs() {
100}
100}
101
101
102inline QString sourceDirectory() {
102inline QString sourceDirectory() {
103− return QString("@CMAKE_SOURCE_DIR@/");
103+ return QStringLiteral("@CMAKE_SOURCE_DIR@/");
104}
104}
105
105
106inline void prependImportPaths(QQmlEngine *engine, const QStringList &paths)
106inline void prependImportPaths(QQmlEngine *engine, const QStringList &paths)