Merge remote-tracking branch 'upstream/develop' into upstream_update

2021-12-31 18:05:40 +01:00
parent 0c177b1086 9579231ccc
commit fa98ed3ccd
53 changed files with 268 additions and 163 deletions
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@ -523,7 +523,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
    // Set up paths
    {
        // Root path is used for updates.
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
        QDir foo(FS::PathCombine(binPath, ".."));
        m_rootPath = foo.absolutePath();
 #elif defined(Q_OS_WIN32)