From 66b1d80f38c2ee82c5ebacf9b8d5bf48ebbf1e08 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Fri, 10 Aug 2018 02:26:06 +0300
Subject: [PATCH] CONFIG param "config_build_dir" has been added

---
 common.pri          | 15 ++++++++++-----
 demo_r1/demo_r1.pro |  5 +++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/common.pri b/common.pri
index 779adad..86adc01 100644
--- a/common.pri
+++ b/common.pri
@@ -1,3 +1,6 @@
+!contains(CONFIG, config_build_dir){
+    TOP_BUILD_DIR = $${PWD}
+}
 
 !contains(CONFIG, no_build_translations){
     CONFIG += build_translations
@@ -27,11 +30,13 @@ CONFIG(release, debug|release){
     BUILD_TYPE = debug
 }
 
-isEmpty(TOP_BUILD_DIR) {
-BUILD_DIR = $${OUT_PWD}/build/$${QT_VERSION}
-}else{
+#isEmpty(TOP_BUILD_DIR) {
+#    BUILD_DIR = $${OUT_PWD}/build/$${QT_VERSION}
+#}else{
+#    BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION}
+#}
+
 BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION}
-}
 
 DEST_INCLUDE_DIR = $$PWD/include
 unix{
@@ -70,7 +75,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 98
+LIMEREPORT_VERSION_RELEASE = 99
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
index 71c0821..128cc34 100644
--- a/demo_r1/demo_r1.pro
+++ b/demo_r1/demo_r1.pro
@@ -46,7 +46,7 @@ unix:{
 	}
 	DESTDIR = $$DEST_DIR
 	#    QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
-	QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
+        QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
 		
 	linux{
 		#Link share lib to ../lib rpath
@@ -67,7 +67,8 @@ win32 {
     DESTDIR = $$DEST_DIR
     RC_FILE += mainicon.rc
 
-    QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
+    QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t)
+    #QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
     !contains(CONFIG, static_build){
 		
 		contains(CONFIG,zint){