diff --git a/CMakeLists.txt b/CMakeLists.txt index 4402252f1..498a83fea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -set(OLIVE_DEFINITIONS -DQT_DEPRECATED_WARNINGS) +set(OLIVE_DEFINITIONS -DAPPVERSION="${PROJECT_VERSION}" -DQT_DEPRECATED_WARNINGS) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") diff --git a/app/dialog/about/about.cpp b/app/dialog/about/about.cpp index e34abecec..d8d26c7e2 100644 --- a/app/dialog/about/about.cpp +++ b/app/dialog/about/about.cpp @@ -41,10 +41,11 @@ AboutDialog::AboutDialog(QWidget *parent) : "" "https://www.olivevideoeditor.org/" "

" - "

%1

" // AppName (version identifier) - "

%2

" // First statement - "

%3

" // Second statement + "

%1 %2

" // AppName (version identifier) + "

%3

" // First statement + "

%4

" // Second statement "").arg(QApplication::applicationName(), + QApplication::applicationVersion(), tr("Olive is a non-linear video editor. This software is free and " "protected by the GNU GPL."), tr("Olive Team is obliged to inform users that Olive source code is " diff --git a/app/main.cpp b/app/main.cpp index b1f85b3e7..1d4ac99f2 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) { QCoreApplication::setOrganizationDomain("olivevideoeditor.org"); QCoreApplication::setApplicationName("Olive"); - QString app_version = "0.2.0"; + QString app_version = APPVERSION; #ifdef GITHASH // Anything after the hyphen is considered "unimportant" information. Text BEFORE the hyphen is used in version // checking project files and config files