diff --git a/scwx-qt/source/scwx/qt/main/main.cpp b/scwx-qt/source/scwx/qt/main/main.cpp index 65d7e998..904ff3b3 100644 --- a/scwx-qt/source/scwx/qt/main/main.cpp +++ b/scwx-qt/source/scwx/qt/main/main.cpp @@ -55,8 +55,9 @@ int main(int argc, char* argv[]) auto& logManager = scwx::qt::manager::LogManager::Instance(); logManager.Initialize(); - logger_->info("Supercell Wx v{} ({})", + logger_->info("Supercell Wx v{}.{} ({})", scwx::qt::main::kVersionString_, + scwx::qt::main::kBuildNumber_, scwx::qt::main::kCommitString_); QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true); diff --git a/scwx-qt/source/scwx/qt/main/versions.hpp.in b/scwx-qt/source/scwx/qt/main/versions.hpp.in index 32a69c59..bdf9cd62 100644 --- a/scwx-qt/source/scwx/qt/main/versions.hpp.in +++ b/scwx-qt/source/scwx/qt/main/versions.hpp.in @@ -3,17 +3,12 @@ #include #include -namespace scwx -{ -namespace qt -{ -namespace main +namespace scwx::qt::main { +const std::uint32_t kBuildNumber_ {${build_number}u}; const std::string kCommitString_ {"${commit_string}"}; const std::uint16_t kCopyrightYear_ {${copyright_year}u}; const std::string kVersionString_ {"${version_string}"}; -} // namespace main -} // namespace qt -} // namespace scwx +} // namespace scwx::qt::main diff --git a/scwx-qt/source/scwx/qt/ui/about_dialog.cpp b/scwx-qt/source/scwx/qt/ui/about_dialog.cpp index 42ec4e32..bc24d056 100644 --- a/scwx-qt/source/scwx/qt/ui/about_dialog.cpp +++ b/scwx-qt/source/scwx/qt/ui/about_dialog.cpp @@ -45,7 +45,9 @@ AboutDialog::AboutDialog(QWidget* parent) : } ui->versionLabel->setText( - tr("Version %1").arg(QString::fromStdString(main::kVersionString_))); + tr("Version %1 (Build %2)") + .arg(QString::fromStdString(main::kVersionString_)) + .arg(main::kBuildNumber_)); ui->revisionLabel->setText( tr("Git Revision %2") .arg(repositoryUrl)