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