mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 16:44:39 +03:00
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
This commit is contained in:
parent
c545a716e6
commit
ec37242475
@ -54,7 +54,7 @@ win32 {
|
|||||||
DESTDIR = $$DEST_DIR
|
DESTDIR = $$DEST_DIR
|
||||||
RC_FILE += mainicon.rc
|
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, static_build){
|
||||||
contains(CONFIG,zint){
|
contains(CONFIG,zint){
|
||||||
LIBS += -L$${DEST_LIBS} -lQtZint
|
LIBS += -L$${DEST_LIBS} -lQtZint
|
||||||
|
@ -59,6 +59,6 @@ win32 {
|
|||||||
}
|
}
|
||||||
LIBS += -L$${DEST_LIBS} -llimereport
|
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)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,16 +87,16 @@ contains(CONFIG,build_translations){
|
|||||||
return($$result)
|
return($$result)
|
||||||
}
|
}
|
||||||
|
|
||||||
TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts)
|
TRANSLATIONS = $$prependAll(LANGUAGES, \"$$TRANSLATIONS_PATH/limereport_,.ts\")
|
||||||
|
|
||||||
qtPrepareTool(LUPDATE, lupdate)
|
qtPrepareTool(LUPDATE, lupdate)
|
||||||
ts.commands = $$LUPDATE $$PWD -ts $$TRANSLATIONS
|
ts.commands = $$LUPDATE $$shell_quote($$PWD) -ts $$TRANSLATIONS
|
||||||
|
|
||||||
TRANSLATIONS_FILES =
|
TRANSLATIONS_FILES =
|
||||||
qtPrepareTool(LRELEASE, lrelease)
|
qtPrepareTool(LRELEASE, lrelease)
|
||||||
for(tsfile, TRANSLATIONS) {
|
for(tsfile, TRANSLATIONS) {
|
||||||
qmfile = $$tsfile
|
qmfile = $$tsfile
|
||||||
qmfile ~= s,.ts$,.qm,
|
qmfile ~= s,".ts\"$",".qm\"",
|
||||||
qm.commands += $$LRELEASE -removeidentical $$tsfile -qm $$qmfile $$escape_expand(\\n\\t)
|
qm.commands += $$LRELEASE -removeidentical $$tsfile -qm $$qmfile $$escape_expand(\\n\\t)
|
||||||
tmp_command = $$LRELEASE -removeidentical $$tsfile -qm $$qmfile $$escape_expand(\\n\\t)
|
tmp_command = $$LRELEASE -removeidentical $$tsfile -qm $$qmfile $$escape_expand(\\n\\t)
|
||||||
TRANSLATIONS_FILES += $$qmfile
|
TRANSLATIONS_FILES += $$qmfile
|
||||||
|
Loading…
Reference in New Issue
Block a user