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

2020-01-20 06:07:46 +11:00
parent 7c9c670b00 052ae7325a
commit cfff198503
3 changed files with 6 additions and 5 deletions
@@ -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