git.iko.soy/unity8
on xenial help sign in
When installed, we should only use fallbacks, not override anything system-wide.
commit493aed1a16bbbdb48fd42e132736b3c333dd047c authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 28 Jun 2013, 15:14 (13 years ago) parentc9cc774
1 file changed+2−3
compare with xenial
unifiedsplit
paths.h.in+2−3
paths.h.in+2−3
@@ -48,9 +48,7 @@ inline QString shellAppDirectory() {
4848
4949inline QStringList overrideImportPaths() {
5050 QStringList paths;
51− if (isRunningInstalled()) {
52− paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml");
53− } else {
51+ if (!isRunningInstalled()) {
5452 paths << QString("@CMAKE_BINARY_DIR@/plugins");
5553 }
5654 return paths;
@@ -59,6 +57,7 @@ inline QStringList overrideImportPaths() {
5957inline QStringList fallbackImportPaths() {
6058 QStringList paths;
6159 if (isRunningInstalled()) {
60+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml");
6261 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_PRIVATE_LIBDIR@/qml/mocks");
6362 } else {
6463 paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");