added libVersion method

This commit is contained in:
Andrei Yankovich 2021-11-23 21:49:27 +03:00
parent adc8c103b5
commit eb82ca72e7
6 changed files with 21 additions and 2 deletions

3
.gitignore vendored
View File

@ -46,3 +46,6 @@ CMakeLists.txt.user*
CMakeFiles CMakeFiles
*_autogen *_autogen
cmake_install.cmake cmake_install.cmake
#cmake
notifyservice_global.h

2
CMake

@ -1 +1 @@
Subproject commit cd05493c3a43b04f26c3e3432df4283eb4509d8c Subproject commit 2acf202cf167a89cac108620f1a541525766dbb8

View File

@ -47,7 +47,13 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/qmlNotify_languages/en.ts
prepareQM( ${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}") prepareQM( ${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
setVersion(1 0 1)
updateGitVars()
setVersion(1 0 ${GIT_COMMIT_COUNT})
set(QML_NOTIFY_VERSION 1.0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/notifyservice_global.h.in ${CMAKE_CURRENT_SOURCE_DIR}/notifyservice_global.h @ONLY)
initAll() initAll()

View File

@ -95,6 +95,10 @@ int NotificationService::setQuestion(const Listner& listner,
return setQuestion(listner, NotificationData(title, text, img, code)); return setQuestion(listner, NotificationData(title, text, img, code));
} }
QString NotificationService::libVersion() {
return QML_NOTIFY_VERSION;
}
NotificationService *NotificationService::getService() { NotificationService *NotificationService::getService() {
static auto service = new NotificationService; static auto service = new NotificationService;
return service; return service;

View File

@ -101,6 +101,11 @@ public:
const QString& img = "", const QString& img = "",
int code = 0); int code = 0);
/**
* @brief libVersion This method return string value of the version of this library.
* @return string value of the version of this library.
*/
static QString libVersion();
/** /**
* @brief getService This method return instance to notify service. * @brief getService This method return instance to notify service.

View File

@ -9,5 +9,6 @@
# define NOTIFYSERVICESHARED_EXPORT Q_DECL_IMPORT # define NOTIFYSERVICESHARED_EXPORT Q_DECL_IMPORT
#endif #endif
#define QML_NOTIFY_VERSION "@QML_NOTIFY_VERSION@"
#endif // NOTIFYSERVICE_GLOBAL_H #endif // NOTIFYSERVICE_GLOBAL_H