Integrating latest from github/staging

Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -136,7 +136,7 @@ void MainWindow::Activate()
ui->projectLabel->setText(QStringLiteral("%1: %2")
.arg(tr("Project"))
.arg(m_guiApplicationManager->GetGameName()));
.arg(QDir{m_guiApplicationManager->GetProjectPath()}.absolutePath()));
ui->rootLabel->setText(QStringLiteral("%1: %2")
.arg(tr("Root"))