git.iko.soy/unity8
on xenial help sign in
When installed, we should only use fallbacks, not override anything system-wide.
493aed1Michał Sawicz
paths.h.in+2−3
compare with xenial
unifiedsplit
@@ -48,9 +48,7 @@ inline QString shellAppDirectory() {
48
48
49inline QStringList overrideImportPaths() {
49inline QStringList overrideImportPaths() {
50 QStringList paths;
50 QStringList paths;
51− if (isRunningInstalled()) {
51+ if (!isRunningInstalled()) {
52− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml");
53− } else {
54 paths << QString("@CMAKE_BINARY_DIR@/plugins");
52 paths << QString("@CMAKE_BINARY_DIR@/plugins");
55 }
53 }
56 return paths;
54 return paths;
@@ -59,6 +57,7 @@ inline QStringList overrideImportPaths() {
59inline QStringList fallbackImportPaths() {
57inline QStringList fallbackImportPaths() {
60 QStringList paths;
58 QStringList paths;
61 if (isRunningInstalled()) {
59 if (isRunningInstalled()) {
60+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml");
62 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml/mocks");
61 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml/mocks");
63 } else {
62 } else {
64 paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
63 paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");