From d80eb334ff90099ba1f7f1331e7f2780fa9cc4e3 Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 24 Mar 2016 12:47:39 +0100 Subject: [PATCH 1/3] need end "/" for copy : REPORTS_DIR = $${DEST_DIR}/demo_reports/ --- demo_r1/demo_r1.pro | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index cd2029d..af0bd71 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -5,7 +5,7 @@ greaterThan(QT_MAJOR_VERSION, 4){ QT += widgets printsupport DEFINES += HAVE_QT5 } -CONFIG -= app_bundle +CONFIG += app_bundle TARGET = LRDemo TEMPLATE = app @@ -35,13 +35,13 @@ CONFIG(release, debug|release){ unix{ UNIX_DIR = $$PWD/../build/unix DEST_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/demo - REPORTS_DIR = $${DEST_DIR}/demo_reports + REPORTS_DIR = $${DEST_DIR}/demo_reports/ MOC_DIR = $${OUT_PWD}/moc - UI_DIR = $${OUT_PWD}//ui - UI_HEADERS_DIR = $${OUT_PWD}//ui - UI_SOURCES_DIR = $${OUT_PWD}//ui - OBJECTS_DIR = $${OUT_PWD}//obj - RCC_DIR = $${OUT_PWD}//rcc + UI_DIR = $${OUT_PWD}/ui + UI_HEADERS_DIR = $${OUT_PWD}/ui + UI_SOURCES_DIR = $${OUT_PWD}/ui + OBJECTS_DIR = $${OUT_PWD}/obj + RCC_DIR = $${OUT_PWD}/rcc LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -llimereport contains(CONFIG,zint){ @@ -61,7 +61,7 @@ win32 { EXTRA_DIR ~= s,/,\\,g DEST_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/demo DEST_DIR ~= s,/,\\,g - REPORTS_DIR = $${DEST_DIR}/demo_reports + REPORTS_DIR = $${DEST_DIR}/demo_reports/ REPORTS_DIR ~= s,/,\\,g MOC_DIR = $${OUT_PWD}/moc From 7ed8d40785c83204737b218a9d84bafcb7f37659 Mon Sep 17 00:00:00 2001 From: newsages Date: Thu, 24 Mar 2016 15:10:44 +0100 Subject: [PATCH 2/3] Update Fork --- 3rdparty/3rdparty.pro | 4 -- 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 29 +++++++------- common.pri | 5 ++- demo_r1/demo_r1.pro | 28 ++++++------- limereport/limereport.pro | 51 +++++++++++++++--------- limereport/lrpreviewreportwindow.cpp | 4 +- limereport/lrreportdesignwindow.cpp | 4 +- 7 files changed, 66 insertions(+), 59 deletions(-) diff --git a/3rdparty/3rdparty.pro b/3rdparty/3rdparty.pro index 55b39b9..7630102 100644 --- a/3rdparty/3rdparty.pro +++ b/3rdparty/3rdparty.pro @@ -1,9 +1,5 @@ -#QMAKE_CFLAGS += -std=c99 ZINT_PATH = $$PWD/zint-2.4.4/ ZINT_VERSION = 2.4.4 -#include(qzint.pri) -#win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../zint-2.4.3/build-backend_dll-Desktop_Qt_5_5_0_MSVC2010_32bit-Release/release/ -lQtZint22 -#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../zint-2.4.3/build-backend_dll-Desktop_Qt_5_5_0_MSVC2010_32bit-Release/debug/ -lQtZint22 INCLUDEPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt4 DEPENDPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt4 include($${ZINT_PATH}/backend_qt4/Zint.pro) diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro index db6f84e..57874e8 100644 --- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro +++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro @@ -11,6 +11,7 @@ CONFIG(release, debug|release){ BUILD_TYPE = debug } +include(../../../common.pri) macx{ CONFIG -= dll @@ -105,26 +106,26 @@ SOURCES += \ unix { UNIX_DIR = $${OUT_PWD}/unix - MOC_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/moc - UI_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/ui - UI_HEADERS_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/ui - UI_SOURCES_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/ui - OBJECTS_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/obj - RCC_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/rcc - DESTDIR = $$PWD/../../../build/unix/$${BUILD_TYPE}/lib + MOC_DIR = $${UNIX_DIR}/moc/$${BUILD_TYPE} + UI_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + UI_HEADERS_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + UI_SOURCES_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + OBJECTS_DIR = $${UNIX_DIR}/obj/$${BUILD_TYPE} + RCC_DIR = $${UNIX_DIR}/rcc/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} DLLDESTDIR = $${DESTDIR} } win32 { WIN32_DIR = $${OUT_PWD}/win32 - MOC_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/moc - UI_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/ui - UI_HEADERS_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/ui - UI_SOURCES_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/ui - OBJECTS_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/obj - RCC_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/rcc - DESTDIR = $$PWD/../../../build/win32/$${BUILD_TYPE}/lib + MOC_DIR = $${WIN32_DIR}/moc/$${BUILD_TYPE} + UI_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + UI_HEADERS_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + UI_SOURCES_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + OBJECTS_DIR = $${WIN32_DIR}/obj/$${BUILD_TYPE} + RCC_DIR = $${WIN32_DIR}/rcc/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} DLLDESTDIR = $${DESTDIR} } diff --git a/common.pri b/common.pri index 2e7bf18..424f09e 100644 --- a/common.pri +++ b/common.pri @@ -1,6 +1,7 @@ #CONFIG += build_translations -CONFIG += zint -ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 +#CONFIG += zint +#ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 +BUILD_DIR = $$PWD/build/$${QT_VERSION} LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 3 diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index af0bd71..f721a9e 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -5,7 +5,11 @@ greaterThan(QT_MAJOR_VERSION, 4){ QT += widgets printsupport DEFINES += HAVE_QT5 } -CONFIG += app_bundle + +macx{ + CONFIG += app_bundle +} + TARGET = LRDemo TEMPLATE = app @@ -23,6 +27,8 @@ RESOURCES += \ r1.qrc EXTRA_DIR += $$PWD/demo_reports/* +DEST_DIR = $${BUILD_DIR}/demo/$${BUILD_TYPE} +REPORTS_DIR = $${DEST_DIR}/demo_reports/ CONFIG(release, debug|release){ message(Release) @@ -32,10 +38,7 @@ CONFIG(release, debug|release){ BUILD_TYPE = debug } -unix{ - UNIX_DIR = $$PWD/../build/unix - DEST_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/demo - REPORTS_DIR = $${DEST_DIR}/demo_reports/ +unix{ MOC_DIR = $${OUT_PWD}/moc UI_DIR = $${OUT_PWD}/ui UI_HEADERS_DIR = $${OUT_PWD}/ui @@ -43,25 +46,18 @@ unix{ OBJECTS_DIR = $${OUT_PWD}/obj RCC_DIR = $${OUT_PWD}/rcc - LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -llimereport contains(CONFIG,zint){ - LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -lQtZint + LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -lQtZint } DESTDIR = $$DEST_DIR QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib - QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib - QMAKE_LFLAGS_RPATH += #. .. ./libs target.path = $${DEST_DIR} } win32 { - WIN32_DIR = $$PWD/../build/win32 EXTRA_DIR ~= s,/,\\,g - DEST_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/demo - DEST_DIR ~= s,/,\\,g - REPORTS_DIR = $${DEST_DIR}/demo_reports/ + DEST_DIR ~= s,/,\\,g REPORTS_DIR ~= s,/,\\,g MOC_DIR = $${OUT_PWD}/moc @@ -75,7 +71,7 @@ win32 { RC_FILE += mainicon.rc QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t) - LIBS += -L$$PWD/../build/win32/$${BUILD_TYPE}/lib -llimereport + LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -llimereport } unix{ diff --git a/limereport/limereport.pro b/limereport/limereport.pro index c422868..3730421 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -13,7 +13,11 @@ CONFIG += lib CONFIG += dll CONFIG += create_prl CONFIG += link_prl -CONFIG -= app_bundle + +macx{ + CONFIG -= dll + CONFIG += lib_bundle +} DEFINES += LIMEREPORT_EXPORTS @@ -25,41 +29,49 @@ EXTRA_FILES += \ $$PWD/lrscriptenginemanagerintf.h \ $$PWD/lrcallbackdatasourceintf.h +include(limereport.pri) + DEST_DIR = $$PWD/../include/ unix { + UNIX_DIR = $${OUT_PWD}/unix + MOC_DIR = $${UNIX_DIR}/moc/$${BUILD_TYPE} + UI_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + UI_HEADERS_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + UI_SOURCES_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} + OBJECTS_DIR = $${UNIX_DIR}/obj/$${BUILD_TYPE} + RCC_DIR = $${UNIX_DIR}/rcc/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} + + QMAKE_POST_LINK += mkdir -p $$quote($${BUILD_DIR}/lib/include) $$escape_expand(\\n\\t) + for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}$$escape_expand(\n\t)) + QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}) $$escape_expand(\\n\\t) } - MOC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/moc - UI_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui - UI_HEADERS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui - UI_SOURCES_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui - OBJECTS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/obj - RCC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/rcc - DESTDIR = $$PWD/../build/unix/$${BUILD_TYPE}/lib for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) | $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR/include/) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${BUILD_DIR}/lib/include/) $$escape_expand(\\n\\t) } } win32 { EXTRA_FILES ~= s,/,\\,g DEST_DIR ~= s,/,\\,g + BUILD_DIR ~= s,/,\\,g + + WIN32_DIR = $${OUT_PWD}/win32 + MOC_DIR = $${WIN32_DIR}/moc/$${BUILD_TYPE} + UI_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + UI_HEADERS_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + UI_SOURCES_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} + OBJECTS_DIR = $${WIN32_DIR}/obj/$${BUILD_TYPE} + RCC_DIR = $${WIN32_DIR}/rcc/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} + for(FILE,EXTRA_FILES){ QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DEST_DIR) $$escape_expand(\\n\\t) } - MOC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/moc - UI_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui - UI_HEADERS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui - UI_SOURCES_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui - OBJECTS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/obj - RCC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/rcc - DESTDIR = $$PWD/../build/win32/$${BUILD_TYPE}/lib } -include(limereport.pri) - contains(CONFIG,zint){ message(zint) INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4 @@ -79,6 +91,7 @@ contains(CONFIG,build_translations){ } TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts) + qtPrepareTool(LUPDATE, lupdate) ts.commands = $$LUPDATE $$PWD -ts $$TRANSLATIONS diff --git a/limereport/lrpreviewreportwindow.cpp b/limereport/lrpreviewreportwindow.cpp index e024d28..0619fde 100644 --- a/limereport/lrpreviewreportwindow.cpp +++ b/limereport/lrpreviewreportwindow.cpp @@ -81,8 +81,8 @@ void PreviewReportWindow::restoreSetting() } else { QDesktopWidget *desktop = QApplication::desktop(); - int screenWidth = desktop->width(); - int screenHeight = desktop->height(); + int screenWidth = desktop->screenGeometry().width(); + int screenHeight = desktop->screenGeometry().height(); int x = screenWidth*0.1; int y = screenHeight*0.1; diff --git a/limereport/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp index b90c5f9..b0ebae7 100644 --- a/limereport/lrreportdesignwindow.cpp +++ b/limereport/lrreportdesignwindow.cpp @@ -604,8 +604,8 @@ void ReportDesignWindow::restoreSetting() } else { QDesktopWidget *desktop = QApplication::desktop(); - int screenWidth = desktop->width(); - int screenHeight = desktop->height(); + int screenWidth = desktop->screenGeometry().width(); + int screenHeight = desktop->screenGeometry().height(); int x = screenWidth*0.1; int y = screenHeight*0.1; From 7d6d7d39c8eeedb53097fd3c8d4fd507220df57c Mon Sep 17 00:00:00 2001 From: newsages Date: Sun, 27 Mar 2016 21:02:58 +0200 Subject: [PATCH 3/3] logical Structure folders --- 3rdparty/zint-2.4.4/backend_qt4/Zint.pro | 36 ++----------- common.pri | 32 ++++++++++-- demo_r1/demo_r1.pro | 46 +++++----------- limereport/limereport.pro | 40 ++++---------- translations/limereport_es_ES.qm | Bin 3352 -> 63618 bytes translations/limereport_es_ES.ts | 64 +++++++++++------------ 6 files changed, 88 insertions(+), 130 deletions(-) diff --git a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro index 57874e8..f9ffd8a 100644 --- a/3rdparty/zint-2.4.4/backend_qt4/Zint.pro +++ b/3rdparty/zint-2.4.4/backend_qt4/Zint.pro @@ -3,14 +3,6 @@ DEFINES += NO_PNG TEMPLATE = lib CONFIG += dll -CONFIG(release, debug|release){ - message(Release) - BUILD_TYPE = release -}else{ - message(Debug) - BUILD_TYPE = debug -} - include(../../../common.pri) macx{ @@ -104,29 +96,9 @@ SOURCES += \ $$PWD/../backend/upcean.c +DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib +DLLDESTDIR = $${DESTDIR} unix { - UNIX_DIR = $${OUT_PWD}/unix - MOC_DIR = $${UNIX_DIR}/moc/$${BUILD_TYPE} - UI_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} - UI_HEADERS_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} - UI_SOURCES_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} - OBJECTS_DIR = $${UNIX_DIR}/obj/$${BUILD_TYPE} - RCC_DIR = $${UNIX_DIR}/rcc/$${BUILD_TYPE} - DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} - DLLDESTDIR = $${DESTDIR} + target.path = $${DESTDIR} + INSTALLS = target } - - -win32 { - WIN32_DIR = $${OUT_PWD}/win32 - MOC_DIR = $${WIN32_DIR}/moc/$${BUILD_TYPE} - UI_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} - UI_HEADERS_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} - UI_SOURCES_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} - OBJECTS_DIR = $${WIN32_DIR}/obj/$${BUILD_TYPE} - RCC_DIR = $${WIN32_DIR}/rcc/$${BUILD_TYPE} - DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} - DLLDESTDIR = $${DESTDIR} -} - -INSTALLS = target diff --git a/common.pri b/common.pri index 424f09e..df0e70f 100644 --- a/common.pri +++ b/common.pri @@ -1,8 +1,34 @@ -#CONFIG += build_translations -#CONFIG += zint -#ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 +CONFIG += build_translations +CONFIG += zint +ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 + +CONFIG(release, debug|release){ + message(Release) + BUILD_TYPE = release +}else{ + message(Debug) + BUILD_TYPE = debug +} + BUILD_DIR = $$PWD/build/$${QT_VERSION} +unix:!macx { + ARCH_DIR = $${OUT_PWD}/unix +} +win32 { + ARCH_DIR = $${OUT_PWD}/win32 +} +macx{ + ARCH_DIR = $${OUT_PWD}/macx +} + +MOC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/moc +UI_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui +UI_HEADERS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui +UI_SOURCES_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/ui +OBJECTS_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/obj +RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc + LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 3 LIMEREPORT_VERSION_RELEASE = 10 diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro index f721a9e..4976f75 100644 --- a/demo_r1/demo_r1.pro +++ b/demo_r1/demo_r1.pro @@ -27,32 +27,24 @@ RESOURCES += \ r1.qrc EXTRA_DIR += $$PWD/demo_reports/* -DEST_DIR = $${BUILD_DIR}/demo/$${BUILD_TYPE} -REPORTS_DIR = $${DEST_DIR}/demo_reports/ - -CONFIG(release, debug|release){ - message(Release) - BUILD_TYPE = release -}else{ - message(Debug) - BUILD_TYPE = debug -} +DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo +REPORTS_DIR = $${DEST_DIR}/demo_reports unix{ - MOC_DIR = $${OUT_PWD}/moc - UI_DIR = $${OUT_PWD}/ui - UI_HEADERS_DIR = $${OUT_PWD}/ui - UI_SOURCES_DIR = $${OUT_PWD}/ui - OBJECTS_DIR = $${OUT_PWD}/obj - RCC_DIR = $${OUT_PWD}/rcc - - LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -llimereport -contains(CONFIG,zint){ - LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -lQtZint -} + LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport + contains(CONFIG,zint){ + LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint + } DESTDIR = $$DEST_DIR QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) + #Link share lib to ../lib rpath + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib + QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib + QMAKE_LFLAGS_RPATH += #. .. ./libs + target.path = $${DEST_DIR} + INSTALLS = target } win32 { @@ -60,20 +52,10 @@ win32 { DEST_DIR ~= s,/,\\,g REPORTS_DIR ~= s,/,\\,g - MOC_DIR = $${OUT_PWD}/moc - UI_DIR = $${OUT_PWD}/ui - UI_HEADERS_DIR = $${OUT_PWD}/ui - UI_SOURCES_DIR = $${OUT_PWD}/ui - OBJECTS_DIR = $${OUT_PWD}/obj - RCC_DIR = $${OUT_PWD}/rcc - DESTDIR = $$DEST_DIR RC_FILE += mainicon.rc QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t) - LIBS += -L$${BUILD_DIR}/lib/$${BUILD_TYPE} -llimereport + LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport } -unix{ - INSTALLS = target -} diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 3730421..c44d9b1 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -1,14 +1,6 @@ TARGET = limereport TEMPLATE = lib -CONFIG(release, debug|release){ - message(Release) - BUILD_TYPE = release -}else{ - message(Debug) - BUILD_TYPE = debug -} - CONFIG += lib CONFIG += dll CONFIG += create_prl @@ -34,22 +26,15 @@ include(limereport.pri) DEST_DIR = $$PWD/../include/ unix { - UNIX_DIR = $${OUT_PWD}/unix - MOC_DIR = $${UNIX_DIR}/moc/$${BUILD_TYPE} - UI_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} - UI_HEADERS_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} - UI_SOURCES_DIR = $${UNIX_DIR}/ui/$${BUILD_TYPE} - OBJECTS_DIR = $${UNIX_DIR}/obj/$${BUILD_TYPE} - RCC_DIR = $${UNIX_DIR}/rcc/$${BUILD_TYPE} - DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib - QMAKE_POST_LINK += mkdir -p $$quote($${BUILD_DIR}/lib/include) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) + #for(FILE,EXTRA_FILES){ + # QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}) $$escape_expand(\\n\\t) + #} for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}) $$escape_expand(\\n\\t) - } - for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${BUILD_DIR}/lib/include/) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include/) $$escape_expand(\\n\\t) } } @@ -58,17 +43,10 @@ win32 { DEST_DIR ~= s,/,\\,g BUILD_DIR ~= s,/,\\,g - WIN32_DIR = $${OUT_PWD}/win32 - MOC_DIR = $${WIN32_DIR}/moc/$${BUILD_TYPE} - UI_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} - UI_HEADERS_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} - UI_SOURCES_DIR = $${WIN32_DIR}/ui/$${BUILD_TYPE} - OBJECTS_DIR = $${WIN32_DIR}/obj/$${BUILD_TYPE} - RCC_DIR = $${WIN32_DIR}/rcc/$${BUILD_TYPE} - DESTDIR = $${BUILD_DIR}/lib/$${BUILD_TYPE} + DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib for(FILE,EXTRA_FILES){ - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DEST_DIR) $$escape_expand(\\n\\t) + QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) } } @@ -105,7 +83,7 @@ contains(CONFIG,build_translations){ TRANSLATIONS_FILES += $$qmfile } qm.depends = ts - + OTHER_FILES += $$TRANSLATIONS QMAKE_EXTRA_TARGETS += qm ts POST_TARGETDEPS += qm } diff --git a/translations/limereport_es_ES.qm b/translations/limereport_es_ES.qm index 5e99f0560cbb83d88e603d705f1c8f92461265de..b0946c37ad7e78d0ebcc78b71f94d0f4b670d520 100644 GIT binary patch literal 63618 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 delta 531 zcmZqr$UH-;-eyON#Hsglrk+)l*`Kg*?_DPb21W}8hUf$a29`MttlC$AG(Q8YhbaRC zgB=6wfm9$}%)ol`5Ca3}BnJ0sM;I8GY#=n36oY4WECU0xHG`MgRG|27hKRpkfcnE3 zVw$%C^(}$W+~y3IO)fAnu$D85)USC1RB)FuUrz=#U#6%X@$x;#kEIvg+{@AmcCR$uj~#A9-=DdZY;CvvM7M@eZhv z0YYE4BY!CXMWU~9LKal zNq`}YA(5eoArnX@G2}3$a)8Wa17eP_#G=f^q@2n7nWQ)KF{?06*8iqC`TVnMn?+wN zWz-a5$Y96^Ypep&c?=~$19IS+xia#LGOP0QN)mG>^S)G97GNl2NCm1c0a}!dqLQO5 uwWuUB8KQ3Tu9v}^r@S&?o}BXT_T=1;u9J Lime Report - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -75,7 +75,7 @@ p, li { white-space: pre-wrap; } <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600; color:#000000;">This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</span></p> <p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600; color:#000000;"><br /></p> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; color:#000000;">Copyright 2015 Arin Alexander. All rights reserved.</span></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -84,7 +84,7 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Arin Alexander</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">arin_a@bk.ru</p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -201,11 +201,11 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; font-style:italic; color:#000000;">signature of Ty Coon</span><span style=" font-family:'monospace'; color:#000000;">, 1 April 1990</span></p> <p style=" margin-top:0px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'monospace'; color:#000000;">Ty Coon, President of Vice</span></p> <p style=" margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; background-color:#ffffff;"><span style=" font-family:'sans-serif'; color:#000000; background-color:#ffffff;">That's all there is to it!</span></p></body></html> - + Version 1.1.1 - + @@ -298,19 +298,19 @@ p, li { white-space: pre-wrap; } Driver - + ... - + Ok - + Error - + Connection with name @@ -318,88 +318,88 @@ p, li { white-space: pre-wrap; } already exists - + ya existe LimeReport::ContentItemDesignIntf Variable %1 not found - + Variable %1 no encontrada LimeReport::DataBand Data - + Datos LimeReport::DataBrowser Attention - Atención + Atención Datasources - + Orígenes de Datos Add database connection - + Agregar conexion a base de datos ... - + Add new datasource - + Agregar origen de datos View data - + Ver datos Change datasource - + Cambiar origen de datos Delete datasource - + Eliminar origen de datos Show error - + Mostrar error Variables - + Add new variable - + Agregar variable Edit variable - + Editar variable Delete variable - + Borrarvariable Do you really want to delete "%1" connection ? - + Realmente quieres borrar la conexion "%1"? User variables - + Variables de usuario System variables - + Variables del sistema Do you really want to delete "%1" datasource ? @@ -459,7 +459,7 @@ p, li { white-space: pre-wrap; } LimeReport::DataSourceModel Datasources - + Orígenes de Datos Variables @@ -1115,7 +1115,7 @@ p, li { white-space: pre-wrap; } Data - + Datos Data Header @@ -1444,7 +1444,7 @@ p, li { white-space: pre-wrap; } Data - + Datos Functions @@ -1479,7 +1479,7 @@ p, li { white-space: pre-wrap; } QObject Data - + Datos DataHeader