diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
index 6a780f9..36505d3 100644
--- a/demo_r1/demo_r1.pro
+++ b/demo_r1/demo_r1.pro
@@ -33,7 +33,7 @@ macx{
 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 \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t)
 		
 	linux{
 		#Link share lib to ../lib rpath
@@ -49,7 +49,7 @@ unix:{
 win32 {
     DESTDIR = $$DEST_DIR
     contains(QMAKE_HOST.os, Linux){
-        QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
+        QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t)
     } else {
 	EXTRA_DIR ~= s,/,\\,g
         DEST_DIR ~= s,/,\\,g
diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro
index bcb7fc2..c8abe1f 100644
--- a/demo_r2/demo_r2.pro
+++ b/demo_r2/demo_r2.pro
@@ -33,7 +33,7 @@ macx{
 
 unix:{
     DESTDIR = $$DEST_DIR
-    QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
+    QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t)
 	linux{
 		#Link share lib to ../lib rpath
 		QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
@@ -48,7 +48,7 @@ unix:{
 win32 {
     DESTDIR = $$DEST_DIR
     contains(QMAKE_HOST.os, Linux){
-        QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
+        QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\" $$escape_expand(\n\t)
     } else {
 	EXTRA_DIR ~= s,/,\\,g
         DEST_DIR ~= s,/,\\,g
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index d1ac03d..20bda83 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -48,28 +48,28 @@ include(limereport.pri)
 unix:{
     DESTDIR  = $${DEST_LIBS}
     linux{
-        QMAKE_POST_LINK += mkdir -p $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
+        QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
         for(FILE,EXTRA_FILES){
-            QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # inside of libs make /include/files
+            QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files
         }
     }
     macx{
         for(FILE,EXTRA_FILES){
-            QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t)
+            QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
         }
-        QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
+        QMAKE_POST_LINK += mkdir -p \"$${DESTDIR}/include\" $$escape_expand(\\n\\t)
     }
-    QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($${DEST_INCLUDE_DIR}) $$quote($${DESTDIR})
+    QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DESTDIR}\"
 }
 
 win32 {
     DESTDIR = $${DEST_LIBS}
     contains(QMAKE_HOST.os, Linux){
-        QMAKE_POST_LINK += mkdir -p $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
+        QMAKE_POST_LINK += mkdir -p \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
         for(FILE,EXTRA_FILES){
-            QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # inside of libs make /include/files
+            QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t) # inside of libs make /include/files
         }
-	QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($${DEST_INCLUDE_DIR}) $$quote($${DESTDIR})
+        QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DESTDIR}\"
     } else {
 	EXTRA_FILES ~= s,/,\\,g
 	BUILD_DIR ~= s,/,\\,g
@@ -119,23 +119,16 @@ contains(CONFIG,build_translations){
         return($$result)
     }
 
-    TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts)
+    TRANSLATIONS = $$prependAll(LANGUAGES, \"$$TRANSLATIONS_PATH/limereport_,.ts\")
 
     qtPrepareTool(LUPDATE, lupdate)
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-    ts.commands = $$LUPDATE $$shell_quote($$PWD) -noobsolete -ts $$TRANSLATIONS
-}
-lessThan(QT_MAJOR_VERSION, 5){
-    ts.commands = $$LUPDATE $$quote($$PWD) -noobsolete -ts $$TRANSLATIONS
-}
+    ts.commands = $$LUPDATE \"$$PWD\" -noobsolete -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
     }
     qm.depends = ts