From e9bec1e17f41f66d3567148e110fe8a3b6451fb3 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 6 Dec 2018 19:42:13 +0100 Subject: [PATCH] Make the Nageru version settable from the Meson configuration. --- meson.build | 5 ++++- nageru/aboutdialog.cpp | 3 +++ nageru/aboutdialog.ui | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 2efead5..9dbfd22 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('nageru', 'cpp', default_options: ['buildtype=debugoptimized']) +project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.0-pre') cxx = meson.get_compiler('cpp') @@ -17,6 +17,9 @@ if r.returncode() != 0 endif add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp') +# Make the Nageru version available as a #define. +add_project_arguments('-DNAGERU_VERSION="' + meson.project_version() + '"', language: 'cpp') + # DeckLink has these issues, and we include it from various places. if cxx.has_argument('-Wno-non-virtual-dtor') add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp') diff --git a/nageru/aboutdialog.cpp b/nageru/aboutdialog.cpp index 94ef345..def4151 100644 --- a/nageru/aboutdialog.cpp +++ b/nageru/aboutdialog.cpp @@ -10,6 +10,9 @@ AboutDialog::AboutDialog() : ui(new Ui::AboutDialog) { ui->setupUi(this); + QString str = ui->header->text(); + str.replace("@NAGERU_VERSION@", NAGERU_VERSION); + ui->header->setText(str); connect(ui->button_box, &QDialogButtonBox::accepted, [this]{ this->close(); }); } diff --git a/nageru/aboutdialog.ui b/nageru/aboutdialog.ui index 57caf43..0ffbd44 100644 --- a/nageru/aboutdialog.ui +++ b/nageru/aboutdialog.ui @@ -15,9 +15,9 @@ - + - <p><b>Nageru 1.7.5</b></p> + <p><b>Nageru @NAGERU_VERSION@</b></p> <p>Realtime video mixer</p> -- 2.39.2