merged root6

This commit is contained in:
2019-09-11 12:12:13 +02:00
99 changed files with 6983 additions and 19284 deletions

View File

@@ -951,7 +951,7 @@ void PTextEdit::setupHelpActions()
menu->addAction(a);
a = new QAction(tr( "Author(s) ..." ), this );
a->setStatusTip( tr("Author(s)") );
a->setStatusTip( tr("Help About") );
connect( a, SIGNAL( triggered() ), this, SLOT( helpAbout() ));
menu->addAction(a);
@@ -2547,8 +2547,8 @@ void PTextEdit::musrView()
// make sure that the system environment variables are properly set
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH"));
proc->setProcessEnvironment(env);
proc->setWorkingDirectory(workDir);
@@ -2620,8 +2620,8 @@ void PTextEdit::musrT0()
// make sure that the system environment variables are properly set
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH"));
proc->setProcessEnvironment(env);
proc->setWorkingDirectory(workDir);
@@ -2659,8 +2659,8 @@ 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("DKS") + "/lib:" +
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH"));
proc->setProcessEnvironment(env);
proc->start(cmd, fMusrFTPrevCmd);