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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/dialog/dlgabout.cpp b/src/dialog/dlgabout.cpp
index 3a95f94dc9..7174a46240 100644
--- a/src/dialog/dlgabout.cpp
+++ b/src/dialog/dlgabout.cpp
@@ -5,7 +5,7 @@
 #include "defs_urls.h"
 #include "moc_dlgabout.cpp"
 #include "util/color/color.h"
-#include "util/version.h"
+#include "util/versionstore.h"
 
 DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
     setupUi(this);
@@ -13,18 +13,18 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
     mixxx_icon->load(QString(":/images/mixxx_icon.svg"));
     mixxx_logo->load(QString(":/images/mixxx_logo.svg"));
 
-    QString mixxxVersion = Version::version();
-    QString buildBranch = Version::developmentBranch();
-    QString buildRevision = Version::developmentRevision();
+    QString mixxxVersion = VersionStore::version();
+    QString gitBranch = VersionStore::gitBranch();
+    QString buildRevision = VersionStore::developmentRevision();
 
     QStringList version;
     version.append(mixxxVersion);
 
-    if (!buildBranch.isEmpty() || !buildRevision.isEmpty()) {
+    if (!gitBranch.isEmpty() || !buildRevision.isEmpty()) {
         QStringList buildInfo;
         buildInfo.append("build");
-        if (!buildBranch.isEmpty()) {
-            buildInfo.append(buildBranch);
+        if (!gitBranch.isEmpty()) {
+            buildInfo.append(gitBranch);
         }
         if (!buildRevision.isEmpty()) {
             buildInfo.append(QString("r%1").arg(buildRevision));