mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-26 09:28:11 +03:00
Code

Merge pull request #80 from Spiek/develop

Browse Source 
Fix Windows Build Enviroment
This commit is contained in:
fralx 2017-07-11 12:50:02 +03:00 committed by GitHub
commit 49b6e9500a
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo_r1/demo_r1.pro
View File

@ -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

2
demo_r1/mainicon.rc
View File

@ -1 +1 @@
DI_ICON1 ICON "main.ico" IDI_ICON1 ICON "main.ico"

2
demo_r2/demo_r2.pro
View File

@ -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)
} }

2
demo_r2/mainicon.rc
View File

@ -1 +1 @@
DI_ICON1 ICON "main.ico" IDI_ICON1 ICON "main.ico"

2
designer/mainicon.rc
View File

@ -1 +1 @@
DI_ICON1 ICON "main.ico" IDI_ICON1 ICON "main.ico"

6
limereport/limereport.pro
View File

@ -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