From a15f25b07ad442890bb9a75a7ef7f43cf5ab2ef4 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 31 Aug 2019 22:28:26 -0700
Subject: Return a QString from GetVersionString
---
utils/alsoft-config/mainwindow.cpp | 2 +-
utils/alsoft-config/verstr.cpp | 4 ++--
utils/alsoft-config/verstr.h | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
index c0c0e1e5..aa0df438 100644
--- a/utils/alsoft-config/mainwindow.cpp
+++ b/utils/alsoft-config/mainwindow.cpp
@@ -504,7 +504,7 @@ void MainWindow::showAboutPage()
{
QMessageBox::information(this, tr("About"),
tr("OpenAL Soft Configuration Utility.\nBuilt for OpenAL Soft library version ") +
- tr(GetVersionString()));
+ GetVersionString());
}
diff --git a/utils/alsoft-config/verstr.cpp b/utils/alsoft-config/verstr.cpp
index b2fd0a17..42b1aeac 100644
--- a/utils/alsoft-config/verstr.cpp
+++ b/utils/alsoft-config/verstr.cpp
@@ -4,7 +4,7 @@
#include "version.h"
-const char *GetVersionString()
+QString GetVersionString()
{
- return ALSOFT_VERSION "-" ALSOFT_GIT_COMMIT_HASH " (" ALSOFT_GIT_BRANCH " branch).";
+ return QStringLiteral(ALSOFT_VERSION "-" ALSOFT_GIT_COMMIT_HASH " (" ALSOFT_GIT_BRANCH " branch).");
}
diff --git a/utils/alsoft-config/verstr.h b/utils/alsoft-config/verstr.h
index a97f0895..73e3ecbd 100644
--- a/utils/alsoft-config/verstr.h
+++ b/utils/alsoft-config/verstr.h
@@ -1,6 +1,8 @@
#ifndef VERSTR_H
#define VERSTR_H
-const char *GetVersionString();
+#include <QString>
+
+QString GetVersionString();
#endif /* VERSTR_H */
--
cgit v1.2.3