From da9099cecb3abd0538812489fa25f10f43cb8da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?arne=20kr=C3=BCger?= Date: Fri, 9 Mar 2018 18:33:59 +0100 Subject: [PATCH] -target names for debug built dlls have now a "d" suffix --- 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 11 ++++++++- demo_r1/demo_r1.pro | 30 ++++++++++++++++++++---- demo_r2/demo_r2.pro | 28 ++++++++++++++++++---- designer/designer.pro | 28 ++++++++++++++++++---- limereport/limereport.pro | 20 ++++++++++++++-- translations/limereport_ar.ts | 10 ++++++++ translations/limereport_es_ES.ts | 10 ++++++++ translations/limereport_ru.ts | 10 ++++++++ 8 files changed, 132 insertions(+), 15 deletions(-) diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro index b579cde..7b54d67 100644 --- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro +++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro @@ -19,7 +19,16 @@ unix{ INCLUDEPATH += $$PWD/../backend DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\" DEFINES += QZINT_LIBRARY -TARGET = QtZint +#TARGET = QtZint + +CONFIG(debug, debug|release) { + TARGET = QtZintd +} else { + TARGET = QtZint +} + + + !contains(DEFINES, NO_PNG) { SOURCES += $$PWD/../backend/png.c diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index 26f70cd..ecd57df 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -26,9 +26,21 @@ macx{ } unix:{ - LIBS += -L$${DEST_LIBS} -llimereport + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport + } + contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint + LIBS += -L$${DEST_LIBS} + + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } } DESTDIR = $$DEST_DIR # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | @@ -54,9 +66,19 @@ win32 { QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } } - LIBS += -L$${DEST_LIBS} -llimereport + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport + } } diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro index cec1043..7a2ab07 100644 --- a/demo_r2/demo_r2.pro +++ b/demo_r2/demo_r2.pro @@ -26,9 +26,19 @@ macx{ } unix:{ - LIBS += -L$${DEST_LIBS} -llimereport + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport + } contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } } DESTDIR = $$DEST_DIR QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) @@ -52,9 +62,19 @@ win32 { RC_FILE += mainicon.rc contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport } - LIBS += -L$${DEST_LIBS} -llimereport QMAKE_POST_LINK += $$QMAKE_COPY_DIR \"$$EXTRA_DIR\" \"$$REPORTS_DIR\\demo_reports\" $$escape_expand(\\n\\t) } diff --git a/designer/designer.pro b/designer/designer.pro index e483859..1f0b8ee 100644 --- a/designer/designer.pro +++ b/designer/designer.pro @@ -17,9 +17,19 @@ macx{ } unix:{ - LIBS += -L$${DEST_LIBS} -llimereport + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport + } contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } } DESTDIR = $$DEST_DIR linux{ @@ -42,8 +52,18 @@ win32 { RC_FILE += mainicon.rc contains(CONFIG,zint){ - LIBS += -L$${DEST_LIBS} -lQtZint + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } + LIBS += -L$${DEST_LIBS} + CONFIG(debug, debug|release) { + LIBS += -llimereportd + } else { + LIBS += -llimereport } - LIBS += -L$${DEST_LIBS} -llimereport } diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 6397a71..45f42c1 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -1,4 +1,13 @@ -TARGET = limereport +#TARGET = limereport + + +CONFIG(debug, debug|release) { + TARGET = limereportd +} else { + TARGET = limereport +} + + TEMPLATE = lib CONFIG += lib @@ -60,7 +69,14 @@ contains(CONFIG,zint){ message(zint) INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 - LIBS += -L$${DEST_LIBS} -lQtZint + LIBS += -L$${DEST_LIBS} + + CONFIG(debug, debug|release) { + LIBS += -lQtZintd + } else { + LIBS += -lQtZint + } + } ####### diff --git a/translations/limereport_ar.ts b/translations/limereport_ar.ts index 007f13d..a9354e5 100644 --- a/translations/limereport_ar.ts +++ b/translations/limereport_ar.ts @@ -1563,6 +1563,16 @@ p, li { white-space: pre-wrap; } Preview معاينة + + Report File Change + + + + The report file "%1" has changed names or been deleted. + +This preview is no longer valid. + + LimeReport::ReportFooter diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts index 5d39e3f..bc96385 100644 --- a/translations/limereport_es_ES.ts +++ b/translations/limereport_es_ES.ts @@ -1388,6 +1388,16 @@ p, li { white-space: pre-wrap; } Preview + + Report File Change + + + + The report file "%1" has changed names or been deleted. + +This preview is no longer valid. + + LimeReport::ReportFooter diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts index 3a76892..4adca96 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -1504,6 +1504,16 @@ p, li { white-space: pre-wrap; } Preview Предосмотр + + Report File Change + + + + The report file "%1" has changed names or been deleted. + +This preview is no longer valid. + + LimeReport::ReportFooter