git.iko.soy/unity8
on xenial help sign in
Guard check for cleanliness, though it shouldn't matter
d7f92d3Michael Terry
include/paths.h.in+1−1
compare with xenial
unifiedsplit
@@ -28,7 +28,7 @@ inline QString installRoot() {
28 static bool installRootSet = false;
28 static bool installRootSet = false;
29 if (!installRootSet) {
29 if (!installRootSet) {
30 QString snapRoot = QFile::decodeName(qgetenv("SNAP"));
30 QString snapRoot = QFile::decodeName(qgetenv("SNAP"));
31− if (QCoreApplication::applicationDirPath() ==
31+ if (!snapRoot.isEmpty() && QCoreApplication::applicationDirPath() ==
32 QDir(snapRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {
32 QDir(snapRoot + QStringLiteral("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath()) {
33 installRoot = snapRoot;
33 installRoot = snapRoot;
34 } else if (QCoreApplication::applicationDirPath() ==
34 } else if (QCoreApplication::applicationDirPath() ==