From ec3724247584e0bd79a3dc5eed91b4c7018f4c95 Mon Sep 17 00:00:00 2001
From: Spiek <spiek@ymail.com>
Date: Tue, 11 Jul 2017 10:58:42 +0200
Subject: [PATCH 1/2] Build Environment for Windows has been fixed - language
 files are now compile-able if path to build environment contains white spaces
 - demo reports are now copied correctly if REPORTS_DIR or EXTRA_DIR contains
 white spaces

---
 demo_r1/demo_r1.pro       | 2 +-
 demo_r2/demo_r2.pro       | 2 +-
 limereport/limereport.pro | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
index b620055..7f15359 100644
--- a/demo_r1/demo_r1.pro
+++ b/demo_r1/demo_r1.pro
@@ -54,7 +54,7 @@ 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 $$shell_quote($$EXTRA_DIR\\*) $$shell_quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
     !contains(CONFIG, static_build){
         contains(CONFIG,zint){
             LIBS += -L$${DEST_LIBS} -lQtZint
diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro
index f327957..ae33d88 100644
--- a/demo_r2/demo_r2.pro
+++ b/demo_r2/demo_r2.pro
@@ -59,6 +59,6 @@ win32 {
     }
     LIBS += -L$${DEST_LIBS} -llimereport
 
-    QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t)
+    QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$shell_quote($$EXTRA_DIR\\*) $$shell_quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
 }
 
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index 5f85023..5832173 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -87,16 +87,16 @@ contains(CONFIG,build_translations){
         return($$result)
     }
 
-    TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts)
+    TRANSLATIONS = $$prependAll(LANGUAGES, \"$$TRANSLATIONS_PATH/limereport_,.ts\")
 
     qtPrepareTool(LUPDATE, lupdate)
-    ts.commands = $$LUPDATE $$PWD -ts $$TRANSLATIONS
+    ts.commands = $$LUPDATE $$shell_quote($$PWD) -ts $$TRANSLATIONS
 
     TRANSLATIONS_FILES =
     qtPrepareTool(LRELEASE, lrelease)
     for(tsfile, TRANSLATIONS) {
         qmfile = $$tsfile
-        qmfile ~= s,.ts$,.qm,
+        qmfile ~= s,".ts\"$",".qm\"",
         qm.commands += $$LRELEASE -removeidentical $$tsfile -qm $$qmfile $$escape_expand(\\n\\t)
         tmp_command = $$LRELEASE -removeidentical $$tsfile -qm $$qmfile $$escape_expand(\\n\\t)
         TRANSLATIONS_FILES += $$qmfile

From 4e1a680e09f30802c566a53afde01163ffba716f Mon Sep 17 00:00:00 2001
From: Spiek <spiek@ymail.com>
Date: Tue, 11 Jul 2017 10:59:40 +0200
Subject: [PATCH 2/2] Syntax Error in mainicon.rc files has been fixed

---
 demo_r1/mainicon.rc  | 2 +-
 demo_r2/mainicon.rc  | 2 +-
 designer/mainicon.rc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo_r1/mainicon.rc b/demo_r1/mainicon.rc
index 83c0128..ef4125c 100644
--- a/demo_r1/mainicon.rc
+++ b/demo_r1/mainicon.rc
@@ -1 +1 @@
-DI_ICON1               ICON                    "main.ico"
+IDI_ICON1               ICON                    "main.ico"
diff --git a/demo_r2/mainicon.rc b/demo_r2/mainicon.rc
index 83c0128..ef4125c 100644
--- a/demo_r2/mainicon.rc
+++ b/demo_r2/mainicon.rc
@@ -1 +1 @@
-DI_ICON1               ICON                    "main.ico"
+IDI_ICON1               ICON                    "main.ico"
diff --git a/designer/mainicon.rc b/designer/mainicon.rc
index 83c0128..ef4125c 100644
--- a/designer/mainicon.rc
+++ b/designer/mainicon.rc
@@ -1 +1 @@
-DI_ICON1               ICON                    "main.ico"
+IDI_ICON1               ICON                    "main.ico"