mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 08:28:06 +03:00
Code Activity

Merge tag 'version/1.7.0' into develop

Browse Source 
Finish version/1.7.0

# Conflicts:
#	limereport/report.qrc
This commit is contained in:
Arin Alex
2023-02-07 00:34:52 +03:00
parent 40073d6eb3 8ed3fb6344
commit b6e4610779
91 changed files with 33462 additions and 1087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
limereport/limereport.pro
View File

@@ -72,16 +72,16 @@ win32 {
}
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DESTDIR}\"
} else {
EXTRA_FILES ~= s,/,\\,g
BUILD_DIR ~= s,/,\\,g
DEST_DIR = $$DESTDIR/include
DEST_DIR ~= s,/,\\,g
DEST_INCLUDE_DIR ~= s,/,\\,g
EXTRA_FILES ~= s,/,\\,g
BUILD_DIR ~= s,/,\\,g
DEST_DIR = $$DESTDIR/include
DEST_DIR ~= s,/,\\,g
DEST_INCLUDE_DIR ~= s,/,\\,g
for(FILE,EXTRA_FILES) {
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
}
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\"
QMAKE_POST_LINK += $$QMAKE_COPY \"$$FILE\" \"$${DEST_INCLUDE_DIR}\" $$escape_expand(\\n\\t)
}
QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$${DEST_INCLUDE_DIR}\" \"$${DEST_DIR}\"
}
}
@@ -139,3 +139,4 @@ CONFIG(build_translations) {
}
#### EN AUTOMATIC TRANSLATIONS