Commit 715d729b authored by Ghislain MARY's avatar Ghislain MARY

Use git version in the application.

parent f47e8e29
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
################################################################################ ################################################################################
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
project(linphoneqt) project(linphoneqt VERSION 3.9.0)
set(EXECUTABLE_NAME linphone) set(EXECUTABLE_NAME linphone)
set(TARGET_NAME linphone-qt) set(TARGET_NAME linphone-qt)
...@@ -262,6 +262,8 @@ if(WIN32) ...@@ -262,6 +262,8 @@ if(WIN32)
else() else()
add_executable(${TARGET_NAME} ${SOURCES} ${HEADERS} ${RESOURCES}) add_executable(${TARGET_NAME} ${SOURCES} ${HEADERS} ${RESOURCES})
endif() endif()
bc_git_version(${TARGET_NAME} ${PROJECT_VERSION})
add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-version)
add_dependencies(${TARGET_NAME} update_translations) add_dependencies(${TARGET_NAME} update_translations)
if(NOT WIN32) if(NOT WIN32)
add_dependencies(update_translations check_qml) add_dependencies(update_translations check_qml)
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "translator/DefaultTranslator.hpp" #include "translator/DefaultTranslator.hpp"
#include "App.hpp" #include "App.hpp"
#include "gitversion.h"
#define DEFAULT_LOCALE "en" #define DEFAULT_LOCALE "en"
...@@ -52,8 +53,8 @@ ...@@ -52,8 +53,8 @@
#define SELF_TEST_DELAY 60000 #define SELF_TEST_DELAY 60000
#ifndef LINPHONE_VERSION #ifndef LINPHONE_QT_GIT_VERSION
#define LINPHONE_VERSION "unknown" #define LINPHONE_QT_GIT_VERSION "unknown"
#endif // ifndef LINPHONE_VERSION #endif // ifndef LINPHONE_VERSION
using namespace std; using namespace std;
...@@ -65,7 +66,7 @@ inline bool installLocale (App &app, QTranslator &translator, const QLocale &loc ...@@ -65,7 +66,7 @@ inline bool installLocale (App &app, QTranslator &translator, const QLocale &loc
} }
App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) { App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
setApplicationVersion(LINPHONE_VERSION); setApplicationVersion(LINPHONE_QT_GIT_VERSION);
setWindowIcon(QIcon(WINDOW_ICON_PATH)); setWindowIcon(QIcon(WINDOW_ICON_PATH));
// List available locales. // List available locales.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment