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 5e99f05..b0946c3 100644
Binary files a/translations/limereport_es_ES.qm and b/translations/limereport_es_ES.qm differ
diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts
index c951782..702d834 100644
--- a/translations/limereport_es_ES.ts
+++ b/translations/limereport_es_ES.ts
@@ -59,7 +59,7 @@
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