Merge remote-tracking branch 'upstream/2.3' into main

src/coreservices.cpp

@@ -108,12 +108,6 @@ CoreServices::CoreServices(const CmdlineArgs& args)
 
 void CoreServices::initializeSettings() {
     QString settingsPath = m_cmdlineArgs.getSettingsPath();
-#ifdef __APPLE__
-    Sandbox::checkSandboxed();
-    if (!m_cmdlineArgs.getSettingsPathSet()) {
-        settingsPath = Sandbox::migrateOldSettings();
-    }
-#endif
     m_pSettingsManager = std::make_unique<SettingsManager>(settingsPath);
 }
 

src/main.cpp

@@ -72,6 +72,12 @@ int main(int argc, char * argv[]) {
     QCoreApplication::setApplicationName(VersionStore::applicationName());
     QCoreApplication::setApplicationVersion(VersionStore::version());
 
+    // Construct a list of strings based on the command line arguments
+    CmdlineArgs& args = CmdlineArgs::Instance();
+    if (!args.parse(argc, argv)) {
+        return kParseCmdlineArgsErrorExitCode;
+    }
+
     // If you change this here, you also need to change it in
     // ErrorDialogHandler::errorDialog(). TODO(XXX): Remove this hack.
     QThread::currentThread()->setObjectName("Main");
@@ -81,13 +87,14 @@ int main(int argc, char * argv[]) {
     // the main thread. Bug #1748636.
     ErrorDialogHandler::instance();
 
-    MixxxApplication app(argc, argv);
-
-    // Construct a list of strings based on the command line arguments
-    CmdlineArgs& args = CmdlineArgs::Instance();
-    if (!args.parse(app.arguments())) {
-        return kParseCmdlineArgsErrorExitCode;
+#ifdef __APPLE__
+    Sandbox::checkSandboxed();
+    if (!args.getSettingsPathSet()) {
+        args.setSettingsPath(Sandbox::migrateOldSettings());
     }
+#endif
+
+    MixxxApplication app(argc, argv);
 
 #ifdef __APPLE__
     QDir dir(QApplication::applicationDirPath());

src/test/mixxxtest.cpp

@@ -23,14 +23,8 @@ QString makeTestConfigFile(const QString& path) {
 QScopedPointer<MixxxApplication> MixxxTest::s_pApplication;
 
 MixxxTest::ApplicationScope::ApplicationScope(int& argc, char** argv) {
-    // Construct a list of strings based on the command line arguments
     CmdlineArgs args;
-    QStringList argList;
-    for (int i = 0; i < argc; i++) {
-        argList << QString::fromLocal8Bit(argv[i]);
-    }
-
-    const bool argsParsed = args.parse(argList);
+    const bool argsParsed = args.parse(argc, argv);
     Q_UNUSED(argsParsed);
     DEBUG_ASSERT(argsParsed);
 

src/util/cmdlineargs.cpp

@@ -63,7 +63,13 @@ bool parseLogLevel(
 }
 } // namespace
 
-bool CmdlineArgs::parse(const QStringList& arguments) {
+bool CmdlineArgs::parse(int& argc, char** argv) {
+    QStringList arguments;
+    arguments.reserve(argc);
+    for (int a = 0; a < argc; ++a) {
+        arguments << QString::fromLocal8Bit(argv[a]);
+    }
+
     QCommandLineParser parser;
     parser.setApplicationDescription(QCoreApplication::translate("main",
             "Mixxx is an open source DJ software. For more information, "
@@ -183,8 +189,9 @@ bool CmdlineArgs::parse(const QStringList& arguments) {
     }
 
     if (parser.isSet(helpOption) || parser.isSet(QStringLiteral("help-all"))) {
-        // we need to call process here otherwise there is no way to print the
-        // help-all information
+        // we need to call process here with an initialized QCoreApplication
+        // otherwise there is no way to print the help-all information
+        QCoreApplication coreApp(argc, argv);
         parser.process(arguments);
         return false;
     }

src/util/cmdlineargs.h

@@ -21,7 +21,7 @@ class CmdlineArgs final {
         return cla;
     }
 
-    bool parse(const QStringList& arguments);
+    bool parse(int& argc, char** argv);
 
     const QList<QString>& getMusicFiles() const { return m_musicFiles; }
     bool getStartInFullscreen() const { return m_startInFullscreen; }

src/util/sandbox.cpp

@@ -397,6 +397,7 @@ SecurityTokenPointer Sandbox::openTokenFromBookmark(const QString& canonicalPath
     return nullptr;
 }
 
+#ifdef __APPLE__
 QString Sandbox::migrateOldSettings() {
     // QStandardPaths::DataLocation returns a different location depending on whether the build
     // is signed (and therefore sandboxed with the hardened runtime), so use the absolute path
@@ -469,7 +470,6 @@ QString Sandbox::migrateOldSettings() {
         return sandboxedPath;
     }
 
-#ifdef __APPLE__
     CFURLRef url = CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault, QStringToCFString(legacySettingsPath), kCFURLPOSIXPathStyle, true);
     if (url) {
@@ -529,9 +529,9 @@ QString Sandbox::migrateOldSettings() {
             }
         }
     }
-#endif
     return sandboxedPath;
 }
+#endif
 
 #ifdef __APPLE__
 SandboxSecurityToken::SandboxSecurityToken(const QString& path, CFURLRef url)

src/util/sandbox.h

@@ -33,7 +33,9 @@ class Sandbox {
     static void setPermissionsFilePath(const QString& permissionsFile);
     static void shutdown();
 
+#ifdef __APPLE__
     static QString migrateOldSettings();
+#endif
 
     // Returns true if we are in a sandbox.
     static bool enabled() {