aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--launcher/Application.cpp3
m---------libraries/cmark0
2 files changed, 2 insertions, 1 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index fd2a0378..d4a1284f 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1508,7 +1508,8 @@ QString Application::getJarPath(QString jarFile)
FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_APP_BINARY_NAME),
#endif
FS::PathCombine(m_rootPath, "jars"),
- FS::PathCombine(applicationDirPath(), "jars")
+ FS::PathCombine(applicationDirPath(), "jars"),
+ FS::PathCombine(applicationDirPath(), "..", "jars") // from inside build dir, for debuging
};
for(QString p : potentialPaths)
{
diff --git a/libraries/cmark b/libraries/cmark
-Subproject a8da5a2f252b96eca60ae8bada1a9ba059a3840
+Subproject 5ba25ff40eba44c811f79ab6a792baf945b8307