From 1acaa431c45f3874a0839ffdaa31602738567222 Mon Sep 17 00:00:00 2001 From: newsages Date: Sun, 3 Apr 2016 15:08:17 +0200 Subject: [PATCH 1/3] ARCH_TYPE unix{ ARCH_DIR = $${OUT_PWD}/unix ARCH_TYPE = unix macx{ ARCH_DIR = $${OUT_PWD}/macx ARCH_TYPE = macx } linux{ !contains(QT_ARCH, x86_64){ message("Compiling for 32bit system") ARCH_DIR = $${OUT_PWD}/linux32 ARCH_TYPE = linux32 }else{ message("Compiling for 64bit system") ARCH_DIR = $${OUT_PWD}/linux64 ARCH_TYPE = linux64 } } } win32 { ARCH_DIR = $${OUT_PWD}/win32 ARCH_TYPE = win32 } DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib --- 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 2 +- common.pri | 22 ++++++++++++++++++---- demo_r1/demo_r1.pro | 10 +++++----- demo_r2/demo_r2.pro | 10 +++++----- limereport/limereport.pro | 2 +- translations/limereport_es_ES.ts | 12 ++++++++++++ translations/limereport_ru.ts | 12 ++++++++++++ 7 files changed, 54 insertions(+), 16 deletions(-) diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro index d74139b..30fffed 100644 --- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro +++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro @@ -95,7 +95,7 @@ SOURCES += \ $$PWD/../backend/upcean.c -DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib +DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib DLLDESTDIR = $${DESTDIR} unix { target.path = $${DESTDIR} diff --git a/common.pri b/common.pri index b9892f8..eb7e95c 100644 --- a/common.pri +++ b/common.pri @@ -13,14 +13,28 @@ CONFIG(release, debug|release){ BUILD_DIR = $$PWD/build/$${QT_VERSION} DEST_INCLUDE_DIR = $$PWD/include -unix:!macx { +unix{ ARCH_DIR = $${OUT_PWD}/unix + ARCH_TYPE = unix + macx{ + ARCH_DIR = $${OUT_PWD}/macx + ARCH_TYPE = macx + } + linux{ + !contains(QT_ARCH, x86_64){ + message("Compiling for 32bit system") + ARCH_DIR = $${OUT_PWD}/linux32 + ARCH_TYPE = linux32 + }else{ + message("Compiling for 64bit system") + ARCH_DIR = $${OUT_PWD}/linux64 + ARCH_TYPE = linux64 + } + } } win32 { ARCH_DIR = $${OUT_PWD}/win32 -} -macx{ - ARCH_DIR = $${OUT_PWD}/macx + ARCH_TYPE = win32 } MOC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/moc diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index 5b4ad00..5e3d951 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -18,7 +18,7 @@ RESOURCES += \ r1.qrc EXTRA_DIR += $$PWD/demo_reports -DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r1 +DEST_DIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/demo_r1 REPORTS_DIR = $${DEST_DIR} macx{ @@ -26,9 +26,9 @@ macx{ } unix:{ - LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint } DESTDIR = $$DEST_DIR # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | @@ -54,9 +54,9 @@ win32 { QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint } - LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport } diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro index c184847..3b1484c 100644 --- a/demo_r2/demo_r2.pro +++ b/demo_r2/demo_r2.pro @@ -18,7 +18,7 @@ RESOURCES += \ demo_r2.qrc EXTRA_DIR += $$PWD/demo_reports -DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo_r2 +DEST_DIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/demo_r2 REPORTS_DIR = $${DEST_DIR} macx{ @@ -26,9 +26,9 @@ macx{ } unix:{ - LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint } DESTDIR = $$DEST_DIR # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | @@ -54,9 +54,9 @@ win32 { QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint } - LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport } diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 341a3b4..602e35e 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -26,7 +26,7 @@ EXTRA_FILES += \ include(limereport.pri) unix:{ - DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib + DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib linux{ QMAKE_POST_LINK += mkdir -p $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/ for(FILE,EXTRA_FILES){ diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts index cbf4d19..8c8efbc 100644 --- a/translations/limereport_es_ES.ts +++ b/translations/limereport_es_ES.ts @@ -746,6 +746,18 @@ p, li { white-space: pre-wrap; } of %1 + + Fit page width + + + + Fit page + + + + One to one + + LimeReport::ProxyHolder diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts index 0a3886f..74f1a09 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -905,6 +905,18 @@ p, li { white-space: pre-wrap; } Ctrl+P + + Fit page width + + + + Fit page + + + + One to one + + LimeReport::ProxyHolder From 12824cee9a25dcaf00aa314529df13c4d7157114 Mon Sep 17 00:00:00 2001 From: newsages Date: Sun, 3 Apr 2016 15:09:14 +0200 Subject: [PATCH 2/3] *.qm --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a3667d6..0733bfc 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ qrc_*.cpp ui_*.h Makefile* *build-* +*.qm # QtCreator From abea99bd3f16d739ba69ab029863325d1b8eff03 Mon Sep 17 00:00:00 2001 From: newsages Date: Sun, 3 Apr 2016 15:33:41 +0200 Subject: [PATCH 3/3] simplify DEST_BINS, DEST_LIBS --- 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 2 +- common.pri | 4 +++- demo_r1/demo_r1.pro | 12 ++++++------ demo_r2/demo_r2.pro | 13 ++++++------- limereport/limereport.pro | 6 +++--- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro index 30fffed..eab6525 100644 --- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro +++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro @@ -95,7 +95,7 @@ SOURCES += \ $$PWD/../backend/upcean.c -DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib +DESTDIR = $${DEST_LIBS} DLLDESTDIR = $${DESTDIR} unix { target.path = $${DESTDIR} diff --git a/common.pri b/common.pri index eb7e95c..6594d0d 100644 --- a/common.pri +++ b/common.pri @@ -12,7 +12,6 @@ CONFIG(release, debug|release){ BUILD_DIR = $$PWD/build/$${QT_VERSION} DEST_INCLUDE_DIR = $$PWD/include - unix{ ARCH_DIR = $${OUT_PWD}/unix ARCH_TYPE = unix @@ -37,6 +36,9 @@ win32 { ARCH_TYPE = win32 } +DEST_LIBS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib +DEST_BINS = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/$${TARGET} + MOC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/moc UI_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui UI_HEADERS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index 5e3d951..26f70cd 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -1,7 +1,7 @@ include(../common.pri) QT += core gui -TARGET = LRDemo +TARGET = LRDemo_r1 TEMPLATE = app SOURCES += main.cpp\ @@ -18,7 +18,7 @@ RESOURCES += \ r1.qrc EXTRA_DIR += $$PWD/demo_reports -DEST_DIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/demo_r1 +DEST_DIR = $${DEST_BINS} REPORTS_DIR = $${DEST_DIR} macx{ @@ -26,9 +26,9 @@ macx{ } unix:{ - LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${DEST_LIBS} -llimereport contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${DEST_LIBS} -lQtZint } DESTDIR = $$DEST_DIR # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | @@ -54,9 +54,9 @@ win32 { QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${DEST_LIBS} -lQtZint } - LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${DEST_LIBS} -llimereport } diff --git a/demo_r2/demo_r2.pro b/demo_r2/demo_r2.pro index 3b1484c..a0cef4d 100644 --- a/demo_r2/demo_r2.pro +++ b/demo_r2/demo_r2.pro @@ -1,7 +1,7 @@ include(../common.pri) QT += core gui -TARGET = LRDemo +TARGET = LRDemo_r2 TEMPLATE = app SOURCES += main.cpp\ @@ -18,7 +18,7 @@ RESOURCES += \ demo_r2.qrc EXTRA_DIR += $$PWD/demo_reports -DEST_DIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/demo_r2 +DEST_DIR = $${DEST_BINS} REPORTS_DIR = $${DEST_DIR} macx{ @@ -26,9 +26,9 @@ macx{ } unix:{ - LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${DEST_LIBS} -llimereport contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${DEST_LIBS} -lQtZint } DESTDIR = $$DEST_DIR # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | @@ -54,9 +54,8 @@ win32 { QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${DEST_LIBS} -lQtZint } - LIBS += -L$${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${DEST_LIBS} -llimereport } - diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 602e35e..c10dde9 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -26,7 +26,7 @@ EXTRA_FILES += \ include(limereport.pri) unix:{ - DESTDIR = $${BUILD_DIR}/$${ARCH_TYPE}/$${BUILD_TYPE}/lib + DESTDIR = $${DEST_LIBS} linux{ QMAKE_POST_LINK += mkdir -p $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/ for(FILE,EXTRA_FILES){ @@ -45,7 +45,7 @@ unix:{ win32 { EXTRA_FILES ~= s,/,\\,g BUILD_DIR ~= s,/,\\,g - DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib + DESTDIR = $${DEST_LIBS} DEST_DIR = $$DESTDIR/include DEST_DIR ~= s,/,\\,g DEST_INCLUDE_DIR ~= s,/,\\,g @@ -60,7 +60,7 @@ contains(CONFIG,zint){ message(zint) INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 - LIBS += -L$${DESTDIR} -lQtZint + LIBS += -L$${DEST_LIBS} -lQtZint } #######