From d3038816ca07f9b5f1237facc0ef1f7305e0190f Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Sat, 2 Apr 2016 06:05:41 +0400
Subject: [PATCH] Fix build on Windows

---
 .travis.yml               | 1 +
 demo_r1/demo_r1.pro       | 6 +++---
 demo_r2/demo_r2.pro       | 6 +++---
 limereport/limereport.pro | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 141d09c..4d1be7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,3 +24,4 @@ script:
 
 notifications:
   email: false
+
diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
index 1186599..f3cfd51 100644
--- a/demo_r1/demo_r1.pro
+++ b/demo_r1/demo_r1.pro
@@ -27,8 +27,8 @@ RESOURCES += \
     r1.qrc
 
 EXTRA_DIR     += $$PWD/demo_reports
-DEST_DIR       = $${BUILD_DIR}/$${BUILD_TYPE}/demo
-REPORTS_DIR    = $${DEST_DIR}
+DEST_DIR       = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r1
+REPORTS_DIR    = $${DEST_DIR}/demo_reports
 
 unix:{
     LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
@@ -56,7 +56,7 @@ win32 {
     DESTDIR = $$DEST_DIR
     RC_FILE += mainicon.rc
 
-    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)
     contains(CONFIG,zint){
         LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
     }
diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro
index b2a09dc..893f580 100644
--- a/demo_r2/demo_r2.pro
+++ b/demo_r2/demo_r2.pro
@@ -25,8 +25,8 @@ RESOURCES += \
     demo_r2.qrc
 
 EXTRA_DIR     += $$PWD/demo_reports
-DEST_DIR       = $${BUILD_DIR}/$${BUILD_TYPE}/demo
-REPORTS_DIR    = $${DEST_DIR}
+DEST_DIR       = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r2
+REPORTS_DIR    = $${DEST_DIR}/demo_reports
 
 unix:{
     LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
@@ -54,7 +54,7 @@ win32 {
     DESTDIR = $$DEST_DIR
     RC_FILE += mainicon.rc
 
-    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)
     contains(CONFIG,zint){
         LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
     }
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index 9cff1f5..acf0fcd 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -46,14 +46,14 @@ win32 {
     EXTRA_FILES ~= s,/,\\,g
     BUILD_DIR ~= s,/,\\,g
     DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
-    DEST_DIR = $$DESTDIR/include/
+    DEST_DIR = $$DESTDIR/include
     DEST_DIR ~= s,/,\\,g
     DEST_INCLUDE_DIR ~= s,/,\\,g
 
     for(FILE,EXTRA_FILES){
         QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t)
     }
-    QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}) $$quote($${DEST_DIR})
+    QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($${DEST_INCLUDE_DIR}\\*) $$quote($${DEST_DIR})
 }
 
 contains(CONFIG,zint){