diff options
| author | Chris Robinson <[email protected]> | 2019-08-31 22:28:26 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-08-31 22:28:26 -0700 |
| commit | a15f25b07ad442890bb9a75a7ef7f43cf5ab2ef4 (patch) | |
| tree | 6cab001b7aa074a0edbd7b3aa4fd04827fb5feed /utils/alsoft-config | |
| parent | 5becf4bb73ffc448dbad5ba6dd9377f3c8ab8697 (diff) | |
Return a QString from GetVersionString
Diffstat (limited to 'utils/alsoft-config')
| -rw-r--r-- | utils/alsoft-config/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | utils/alsoft-config/verstr.cpp | 4 | ||||
| -rw-r--r-- | 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 */ |