From 9bbe7631845c6c013ca1ca56ef11b113c7fffec7 Mon Sep 17 00:00:00 2001
From: Ivan Pelipenko <peri4ko@yandex.ru>
Date: Tue, 19 May 2020 18:32:26 +0300
Subject: [PATCH] version 1.2.0_beta QAD_SETUP_APPLICATION, QtWraps.cmake

---
 pip                           |  2 +-
 qad/CMakeLists.txt            |  2 +-
 qad/cmake/QtWraps.cmake       | 10 ++++++++++
 qad/utils/qad_types.h         |  7 +++++++
 qcd_utils/pult/CMakeLists.txt |  6 ++++--
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pip b/pip
index b860d8b..1692d38 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit b860d8bbafcde76290321b3e1b79b8ec400e0700
+Subproject commit 1692d389c9d3c299696f968cb0a8238593f41413
diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt
index 69e7a44..6b30462 100644
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -4,7 +4,7 @@ project(qad)
 set(_QAD_MAJOR    1)
 set(_QAD_MINOR    2)
 set(_QAD_REVISION 0)
-set(_QAD_SUFFIX   alpha)
+set(_QAD_SUFFIX   beta)
 set(_QAD_COMPANY  SHS)
 set(_QAD_DOMAIN   org.SHS)
 
diff --git a/qad/cmake/QtWraps.cmake b/qad/cmake/QtWraps.cmake
index 82668e7..1d43fc3 100644
--- a/qad/cmake/QtWraps.cmake
+++ b/qad/cmake/QtWraps.cmake
@@ -448,6 +448,14 @@ macro(_qt_split_add_args _P _A)
 endmacro()
 
 
+macro(__qt_set_defines _NAME _T)
+	target_compile_definitions(${_T} PRIVATE "__TARGET_NAME__=\"${_NAME}\"")
+	target_compile_definitions(${_T} PRIVATE "__TARGET_LABEL__=\"${${_NAME}_LABEL}\"")
+	target_compile_definitions(${_T} PRIVATE "__TARGET_COMPANY__=\"${${_NAME}_COMPANY}\"")
+	target_compile_definitions(${_T} PRIVATE "__TARGET_VERSION__=\"${${_NAME}_VERSION}\"")
+endmacro()
+
+
 macro(qt_add_executable _NAME)
 	foreach(_v ${_QT_VERSIONS_})
 		if (LOCAL_FOUND${_v})
@@ -464,6 +472,7 @@ macro(qt_add_executable _NAME)
 			add_executable(${_TARGET} ${_PREF} ${_ARGS})
 			set(_${_NAME}_is_qt 1)
 			target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
+			__qt_set_defines(${_NAME} ${_TARGET})
 
 			if(APPLE)
 				set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}")
@@ -502,6 +511,7 @@ macro(qt_add_library _NAME)
 			add_library(${_TARGET} ${_PREF} ${_ARGS})
 			set(_${_NAME}_is_qt 1)
 			target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
+			__qt_set_defines(${_NAME} ${_TARGET})
 			#message("add lib: \"${_TARGET}\"")
 
 			if(APPLE)
diff --git a/qad/utils/qad_types.h b/qad/utils/qad_types.h
index 3ba3ac2..595e18e 100644
--- a/qad/utils/qad_types.h
+++ b/qad/utils/qad_types.h
@@ -22,7 +22,14 @@
 
 #include "propertystorage.h"
 #include "qad_export.h"
+#include <QCoreApplication>
 
+//! Set QCoreApplication properties from CMake "deploy_properties"
+//! Affect applicationName, organizationName and applicationVersion
+#define QAD_SETUP_APPLICATION \
+	QCoreApplication::setApplicationName(__TARGET_NAME__); \
+	QCoreApplication::setOrganizationName(__TARGET_COMPANY__); \
+	QCoreApplication::setApplicationVersion(__TARGET_VERSION__);
 
 class QMetaEnum;
 
diff --git a/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt
index 464b304..b7f80cb 100644
--- a/qcd_utils/pult/CMakeLists.txt
+++ b/qcd_utils/pult/CMakeLists.txt
@@ -6,6 +6,10 @@ set_deploy_property(${PROJECT_NAME}
 		FULLNAME 	"${_QCD_DOMAIN}.${PROJECT_NAME}"
 		COMPANY 	${_QCD_COMPANY}
 		INFO 		"CD Pult")
+if (Qt5_FOUND)
+	import_version(${PROJECT_NAME}5 ${PROJECT_NAME})
+	import_deploy_properties(${PROJECT_NAME}5 ${PROJECT_NAME})
+endif()
 make_rc(${PROJECT_NAME} out_RC)
 qt_sources(SRC)
 qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
@@ -28,7 +32,5 @@ else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 endif()
 if (Qt5_FOUND)
-	import_version(${PROJECT_NAME}5 ${PROJECT_NAME})
-	import_deploy_properties(${PROJECT_NAME}5 ${PROJECT_NAME})
 	deploy_target(${PROJECT_NAME}5 VERBOSE DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../release)
 endif()