mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-23 16:22:58 +03:00
logical Structure folders
This commit is contained in:
newsages
parent
61672e3b7a
commit
7d6d7d39c8
36
3rdparty/zint-2.4.4/backend_qt4/Zint.pro
vendored
36
3rdparty/zint-2.4.4/backend_qt4/Zint.pro
vendored
@ -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
|
||||
|
||||
32
common.pri
32
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
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
Binary file not shown.
@ -59,7 +59,7 @@
|
||||
</message>
|
||||
<message>
|
||||
<source>Lime Report</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><!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></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><!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></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><!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></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Version 1.1.1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@ -298,19 +298,19 @@ p, li { white-space: pre-wrap; }
|
||||
</message>
|
||||
<message>
|
||||
<source>Driver</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Ok</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Error</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Connection with name </source>
|
||||
@ -318,88 +318,88 @@ p, li { white-space: pre-wrap; }
|
||||
</message>
|
||||
<message>
|
||||
<source> already exists </source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>ya existe</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>LimeReport::ContentItemDesignIntf</name>
|
||||
<message>
|
||||
<source>Variable %1 not found</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Variable %1 no encontrada</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>LimeReport::DataBand</name>
|
||||
<message>
|
||||
<source>Data</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Datos</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>LimeReport::DataBrowser</name>
|
||||
<message>
|
||||
<source>Attention</source>
|
||||
<translation type="unfinished">Atención</translation>
|
||||
<translation>Atención</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Datasources</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Orígenes de Datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Add database connection</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Agregar conexion a base de datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Add new datasource</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Agregar origen de datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>View data</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Ver datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Change datasource</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Cambiar origen de datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Delete datasource</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Eliminar origen de datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Show error</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Mostrar error</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Variables</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Add new variable</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Agregar variable</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Edit variable</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Editar variable</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Delete variable</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Borrarvariable</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Do you really want to delete "%1" connection ?</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Realmente quieres borrar la conexion "%1"?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>User variables</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Variables de usuario</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>System variables</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Variables del sistema</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Do you really want to delete "%1" datasource ?</source>
|
||||
@ -459,7 +459,7 @@ p, li { white-space: pre-wrap; }
|
||||
<name>LimeReport::DataSourceModel</name>
|
||||
<message>
|
||||
<source>Datasources</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation type="unfinished">Orígenes de Datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Variables</source>
|
||||
@ -1115,7 +1115,7 @@ p, li { white-space: pre-wrap; }
|
||||
</message>
|
||||
<message>
|
||||
<source>Data</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation type="unfinished">Datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Data Header</source>
|
||||
@ -1444,7 +1444,7 @@ p, li { white-space: pre-wrap; }
|
||||
</message>
|
||||
<message>
|
||||
<source>Data</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation type="unfinished">Datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Functions</source>
|
||||
@ -1479,7 +1479,7 @@ p, li { white-space: pre-wrap; }
|
||||
<name>QObject</name>
|
||||
<message>
|
||||
<source>Data</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation type="unfinished">Datos</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>DataHeader</source>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user