git.iko.soy/unity8
on xenial help sign in
adjust paths.h to match new install paths
4d290f2Michael Zanetti
paths.h.in+2−2
compare with xenial
unifiedsplit
@@ -49,7 +49,7 @@ inline QString shellAppDirectory() {
49inline QStringList shellImportPaths() {
49inline QStringList shellImportPaths() {
50 QStringList paths;
50 QStringList paths;
51 if (isRunningInstalled()) {
51 if (isRunningInstalled()) {
52− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
52+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml");
53 } else {
53 } else {
54 paths << QString("@CMAKE_BINARY_DIR@/plugins");
54 paths << QString("@CMAKE_BINARY_DIR@/plugins");
55 }
55 }
@@ -58,7 +58,7 @@ inline QStringList shellImportPaths() {
58
58
59inline QString fakePluginsImportPath() {
59inline QString fakePluginsImportPath() {
60 if (isRunningInstalled()) {
60 if (isRunningInstalled()) {
61− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins/mocks");
61+ return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml/mocks");
62 } else {
62 } else {
63 return QString("@CMAKE_BINARY_DIR@/tests/mocks");
63 return QString("@CMAKE_BINARY_DIR@/tests/mocks");
64 }
64 }