mirror of
				https://github.com/fralx/LimeReport.git
				synced 2025-10-30 04:57:13 +03:00 
			
		
		
		
	-target names for debug built dlls have now a "d" suffix
This commit is contained in:
		
							
								
								
									
										9
									
								
								3rdparty/zint-2.4.4/backend_qt4/Zint.pro
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								3rdparty/zint-2.4.4/backend_qt4/Zint.pro
									
									
									
									
										vendored
									
									
								
							| @@ -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 | ||||
|  | ||||
| CONFIG(debug, debug|release) { | ||||
|     TARGET = QtZintd | ||||
| } else { | ||||
|     TARGET = QtZint | ||||
| } | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| !contains(DEFINES, NO_PNG) { | ||||
|     SOURCES += $$PWD/../backend/png.c | ||||
|   | ||||
| @@ -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} | ||||
|         CONFIG(debug, debug|release) { | ||||
|             LIBS += -llimereportd | ||||
|         } else { | ||||
|             LIBS += -llimereport | ||||
|         } | ||||
|     LIBS += -L$${DEST_LIBS} -llimereport | ||||
| } | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -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) | ||||
| } | ||||
|   | ||||
| @@ -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 | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -1,4 +1,13 @@ | ||||
| #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 | ||||
|     } | ||||
|  | ||||
| } | ||||
|  | ||||
| ####### | ||||
|   | ||||
| @@ -1563,6 +1563,16 @@ p, li { white-space: pre-wrap; } | ||||
|         <source>Preview</source> | ||||
|         <translation type="unfinished">معاينة</translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>Report File Change</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>The report file "%1" has changed names or been deleted. | ||||
|  | ||||
| This preview is no longer valid.</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>LimeReport::ReportFooter</name> | ||||
|   | ||||
| @@ -1388,6 +1388,16 @@ p, li { white-space: pre-wrap; } | ||||
|         <source>Preview</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>Report File Change</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>The report file "%1" has changed names or been deleted. | ||||
|  | ||||
| This preview is no longer valid.</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>LimeReport::ReportFooter</name> | ||||
|   | ||||
| @@ -1504,6 +1504,16 @@ p, li { white-space: pre-wrap; } | ||||
|         <source>Preview</source> | ||||
|         <translation>Предосмотр</translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>Report File Change</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>The report file "%1" has changed names or been deleted. | ||||
|  | ||||
| This preview is no longer valid.</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>LimeReport::ReportFooter</name> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user