Merge branch 'version-from-cmake' of https://github.com/eszlari/olive into eszlari-version-from-cmake

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")
 

app/dialog/about/about.cpp

@@ -41,10 +41,11 @@ AboutDialog::AboutDialog(QWidget *parent) :
                                 "<span style=\" text-decoration: underline; color:#007af4;\">"
                                 "https://www.olivevideoeditor.org/"
                                 "</span></a></p>"
-                                "<p><b>%1</b></p>" // AppName (version identifier)
-                                "<p>%2</p>" // First statement
-                                "<p>%3</p>" // Second statement
+                                "<p><b>%1</b> %2</p>" // AppName (version identifier)
+                                "<p>%3</p>" // First statement
+                                "<p>%4</p>" // Second statement
                                 "</body></html>").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 "

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