adopted the the new dyld on macOS Monterey.

src/musredit_qt5/mupp/Pmupp.cpp

@@ -296,7 +296,11 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln, QString &errorMsg)
     connect( fProc, SIGNAL( finished(int, QProcess::ExitStatus) ), this, SLOT( processDone(int, QProcess::ExitStatus) ) );
 
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+    env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
     env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
     cmd = env.value("MUSRFITPATH") + QString("/msr2data");
     if (!QFile::exists(cmd)) { // MUSRFITPATH not set?
       // try ROOTSYS

src/musredit_qt5/mupp/PmuppGui.cpp

@@ -2416,7 +2416,7 @@ void PmuppGui::startMuppPlot()
 {
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
   QString cmd = QString("%1/bin/mupp_plot").arg(MUPP_PREFIX);
-#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
   cmd = QString("/Applications/mupp.app/Contents/MacOS/mupp_plot");
 #endif
   QString workDir = QString("./");
@@ -2432,7 +2432,11 @@ void PmuppGui::startMuppPlot()
   }
 
   // make sure that the system environment variables are properly set
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   fMuppPlot->setProcessEnvironment(env);
   fMuppPlot->setWorkingDirectory(workDir);
   fMuppPlot->start(cmd, arg);

src/musredit_qt5/mupp/PmuppScript.cpp

@@ -536,7 +536,11 @@ int PmuppScript::plot(const QString str)
   arg << "-q";
 
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(fSavePath);
   proc->start(exec_cmd, arg);

src/musredit_qt5/musrWiz/PMusrWiz.cpp

@@ -1955,7 +1955,7 @@ PMusrWiz::PMusrWiz(PAdmin *admin, PMsrData *msrData, QWidget *parent) :
   fAdmin(admin),
   fMsrData(msrData)
 {
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
   setWizardStyle(ModernStyle);
 #endif
 

src/musredit_qt5/musredit/PDumpOutputHandler.cpp

@@ -62,7 +62,11 @@ PDumpOutputHandler::PDumpOutputHandler(QVector<QString> &cmd)
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   fProc->setProcessEnvironment(env);
 
   // Set up the command and arguments.

src/musredit_qt5/musredit/PFitOutputHandler.cpp

@@ -65,7 +65,11 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QVector<QString>
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   fProc->setProcessEnvironment(env);
   fProc->setWorkingDirectory(workingDirectory);
 

src/musredit_qt5/musredit/PTextEdit.cpp

@@ -1984,7 +1984,7 @@ void PTextEdit::textSize( const QString &p )
 void PTextEdit::musrWiz()
 {
   QString cmd = fAdmin->getExecPath() + "/musrWiz";
-#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
   cmd = QString("/Applications/musrWiz.app/Contents/MacOS/musrWiz");
 #endif
   QString workDir = "./"; // think about it!!
@@ -2003,7 +2003,11 @@ void PTextEdit::musrWiz()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2558,7 +2562,11 @@ void PTextEdit::musrView()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2629,7 +2637,11 @@ void PTextEdit::musrT0()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2666,7 +2678,11 @@ void PTextEdit::musrFT()
     proc->setStandardErrorFile("musrFT.log");
     QString cmd = fAdmin->getExecPath() + "/musrFT";
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
+  env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
     proc->setProcessEnvironment(env);
     proc->start(cmd, fMusrFTPrevCmd);
     if (!proc->waitForStarted()) {
@@ -2759,7 +2775,7 @@ void PTextEdit::musrSetSteps()
 
   // fill the command queue
   QString cmd = fAdmin->getExecPath() + "/musrStep";
-#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
   cmd = QString("/Applications/musrStep.app/Contents/MacOS/musrStep");
 #endif
   QString workDir = QFileInfo(*fFilenames.find( currentEditor() )).absolutePath();
@@ -2785,7 +2801,11 @@ void PTextEdit::musrSetSteps()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2936,7 +2956,7 @@ void PTextEdit::mupp()
 {
   QString cmd("");
   cmd = fAdmin->getExecPath() + "/mupp";
-#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
   cmd = QString("/Applications/mupp.app/Contents/MacOS/mupp");
 #endif
 
@@ -2948,7 +2968,11 @@ void PTextEdit::mupp()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);

src/musredit_qt6/mupp/Pmupp.cpp

@@ -297,7 +297,11 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln, QString &errorMsg)
     connect( fProc, SIGNAL( finished(int, QProcess::ExitStatus) ), this, SLOT( processDone(int, QProcess::ExitStatus) ) );
 
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+    env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
     env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
     cmd = env.value("MUSRFITPATH") + QString("/msr2data");
     if (!QFile::exists(cmd)) { // MUSRFITPATH not set?
       // try ROOTSYS

src/musredit_qt6/mupp/PmuppGui.cpp

@@ -2226,7 +2226,7 @@ void PmuppGui::startMuppPlot()
 {
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
   QString cmd = QString("%1/bin/mupp_plot").arg(MUPP_PREFIX);
-#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
   cmd = QString("/Applications/mupp.app/Contents/MacOS/mupp_plot");
 #endif
   QString workDir = QString("./");
@@ -2242,7 +2242,11 @@ void PmuppGui::startMuppPlot()
   }
 
   // make sure that the system environment variables are properly set
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   fMuppPlot->setProcessEnvironment(env);
   fMuppPlot->setWorkingDirectory(workDir);
   fMuppPlot->start(cmd, arg);

src/musredit_qt6/mupp/PmuppScript.cpp

@@ -512,7 +512,11 @@ int PmuppScript::plot(const QString str)
   arg << "-q";
 
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(fSavePath);
   proc->start(exec_cmd, arg);

src/musredit_qt6/musrWiz/PMusrWiz.cpp

@@ -1947,7 +1947,7 @@ PMusrWiz::PMusrWiz(PAdmin *admin, PMsrData *msrData, QWidget *parent) :
   fAdmin(admin),
   fMsrData(msrData)
 {
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
   setWizardStyle(ModernStyle);
 #endif
 

src/musredit_qt6/musredit/PDumpOutputHandler.cpp

@@ -62,7 +62,11 @@ PDumpOutputHandler::PDumpOutputHandler(QVector<QString> &cmd)
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   fProc->setProcessEnvironment(env);
 
   // Set up the command and arguments.

src/musredit_qt6/musredit/PFitOutputHandler.cpp

@@ -65,7 +65,11 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QVector<QString>
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   fProc->setProcessEnvironment(env);
   fProc->setWorkingDirectory(workingDirectory);
 

src/musredit_qt6/musredit/PTextEdit.cpp

@@ -1989,7 +1989,7 @@ void PTextEdit::textSize( const QString &p )
 void PTextEdit::musrWiz()
 {
   QString cmd = fAdmin->getExecPath() + "/musrWiz";
-#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
   cmd = QString("/Applications/musrWiz.app/Contents/MacOS/musrWiz");
 #endif
   QString workDir = "./"; // think about it!!
@@ -2008,7 +2008,11 @@ void PTextEdit::musrWiz()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2563,7 +2567,11 @@ void PTextEdit::musrView()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2634,7 +2642,11 @@ void PTextEdit::musrT0()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2671,7 +2683,11 @@ void PTextEdit::musrFT()
     proc->setStandardErrorFile("musrFT.log");
     QString cmd = fAdmin->getExecPath() + "/musrFT";
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+    env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
     env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
     proc->setProcessEnvironment(env);
     proc->start(cmd, fMusrFTPrevCmd);
     if (!proc->waitForStarted()) {
@@ -2764,7 +2780,7 @@ void PTextEdit::musrSetSteps()
 
   // fill the command queue
   QString cmd = fAdmin->getExecPath() + "/musrStep";
-#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
   cmd = QString("/Applications/musrStep.app/Contents/MacOS/musrStep");
 #endif
   QString workDir = QFileInfo(*fFilenames.find( currentEditor() )).absolutePath();
@@ -2790,7 +2806,11 @@ void PTextEdit::musrSetSteps()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2941,7 +2961,7 @@ void PTextEdit::mupp()
 {
   QString cmd("");
   cmd = fAdmin->getExecPath() + "/mupp";
-#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_DARWIN)
   cmd = QString("/Applications/mupp.app/Contents/MacOS/mupp");
 #endif
 
@@ -2953,7 +2973,11 @@ void PTextEdit::mupp()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+#endif
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);