python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-25 04:54:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

no_zint & static_build flags has been added

Browse Source
This commit is contained in:
Arin Alex 2017-06-16 03:08:28 +03:00
commit 60c45b8832
10 changed files with 63 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
3rdparty/zint-2.4.4/backend_qt4/Zint.pro vendored
View File

@ -1,7 +1,15 @@
DEFINES += NO_PNG DEFINES += NO_PNG
TEMPLATE = lib TEMPLATE = lib
CONFIG += dll
contains(CONFIG, static_build){
CONFIG += staticlib
DEFINES += HAVE_STATIC_BUILD
}
!contains(CONFIG, staticlib){
CONFIG += dll
DEFINES += QZINT_LIBRARY
}
include(../../../common.pri) include(../../../common.pri)
@ -18,7 +26,6 @@ unix{
INCLUDEPATH += $$PWD/../backend INCLUDEPATH += $$PWD/../backend
DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\" DEFINES += _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ZINT_VERSION=\\\"$$VERSION\\\"
DEFINES += QZINT_LIBRARY
TARGET = QtZint TARGET = QtZint
!contains(DEFINES, NO_PNG) { !contains(DEFINES, NO_PNG) {

4
3rdparty/zint-2.4.4/backend_qt4/qzint_global.h vendored
View File

@ -3,10 +3,14 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#ifdef HAVE_STATIC_BUILD
# define QZINTSHARED_EXPORT /**/
#else
#if defined(QZINT_LIBRARY) #if defined(QZINT_LIBRARY)
# define QZINTSHARED_EXPORT Q_DECL_EXPORT # define QZINTSHARED_EXPORT Q_DECL_EXPORT
#else #else
# define QZINTSHARED_EXPORT Q_DECL_IMPORT # define QZINTSHARED_EXPORT Q_DECL_IMPORT
#endif #endif
#endif
#endif // QZINT_GLOBAL_H #endif // QZINT_GLOBAL_H

7
common.pri
View File

@ -1,5 +1,8 @@
CONFIG += build_translations CONFIG += build_translations
CONFIG += zint
!contains(CONFIG, no_zint){
CONFIG += zint
}
ZINT_PATH = $$PWD/3rdparty/zint-2.4.4 ZINT_PATH = $$PWD/3rdparty/zint-2.4.4
contains(CONFIG,zint){ contains(CONFIG,zint){
@ -59,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 17 LIMEREPORT_VERSION_RELEASE = 18
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

12
demo_r1/demo_r1.pro
View File

@ -27,8 +27,10 @@ macx{
unix:{ unix:{
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS} -llimereport
contains(CONFIG,zint){ !contains(CONFIG, static_build){
LIBS += -L$${DEST_LIBS} -lQtZint contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint
}
} }
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
# QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | # QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) |
@ -53,8 +55,10 @@ win32 {
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR\\*) $$quote($$REPORTS_DIR\\demo_reports) $$escape_expand(\\n\\t)
contains(CONFIG,zint){ !contains(CONFIG, static_build){
LIBS += -L$${DEST_LIBS} -lQtZint contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint
}
} }
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS} -llimereport
} }

13
demo_r2/demo_r2.pro
View File

@ -27,8 +27,10 @@ macx{
unix:{ unix:{
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS} -llimereport
contains(CONFIG,zint){ !contains(CONFIG, static_build){
LIBS += -L$${DEST_LIBS} -lQtZint contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint
}
} }
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
@ -50,9 +52,10 @@ win32 {
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
!contains(CONFIG, static_build){
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS} -lQtZint
}
} }
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS} -llimereport

13
designer/designer.pro
View File

@ -18,8 +18,10 @@ macx{
unix:{ unix:{
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS} -llimereport
contains(CONFIG,zint){ !contains(CONFIG, static_build){
LIBS += -L$${DEST_LIBS} -lQtZint contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint
}
} }
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
linux{ linux{
@ -40,9 +42,10 @@ win32 {
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
RC_FILE += mainicon.rc RC_FILE += mainicon.rc
!contains(CONFIG, static_build){
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${DEST_LIBS} -lQtZint LIBS += -L$${DEST_LIBS} -lQtZint
}
} }
LIBS += -L$${DEST_LIBS} -llimereport LIBS += -L$${DEST_LIBS} -llimereport
} }

6
limereport.pro
View File

@ -1,9 +1,15 @@
TEMPLATE = subdirs TEMPLATE = subdirs
!contains(CONFIG, no_zint){
CONFIG += zint
}
include(common.pri) include(common.pri)
contains(CONFIG, zint){ contains(CONFIG, zint){
SUBDIRS += 3rdparty SUBDIRS += 3rdparty
} }
export($$CONFIG)
SUBDIRS += \ SUBDIRS += \
limereport limereport

12
limereport/limereport.pro
View File

@ -1,9 +1,15 @@
TARGET = limereport TARGET = limereport
TEMPLATE = lib TEMPLATE = lib
CONFIG += lib contains(CONFIG, static_build){
CONFIG += dll CONFIG += staticlib
#CONFIG += staticlib }
!contains(CONFIG, staticlib){
CONFIG += lib
CONFIG += dll
}
CONFIG += create_prl CONFIG += create_prl
CONFIG += link_prl CONFIG += link_prl

4
limereport/lrfactoryinitializer.cpp
View File

@ -39,7 +39,7 @@
#include "serializators/lrxmlqrectserializator.h" #include "serializators/lrxmlqrectserializator.h"
#include "serializators/lrxmlserializatorsfactory.h" #include "serializators/lrxmlserializatorsfactory.h"
inline void initResources(){ void initResources(){
Q_INIT_RESOURCE(report); Q_INIT_RESOURCE(report);
Q_INIT_RESOURCE(lobjectinspector); Q_INIT_RESOURCE(lobjectinspector);
Q_INIT_RESOURCE(lrdatabrowser); Q_INIT_RESOURCE(lrdatabrowser);
@ -95,9 +95,11 @@ BaseDesignIntf * createTextItem(QObject* owner, LimeReport::BaseDesignIntf* par
return new LimeReport::TextItem(owner,parent); return new LimeReport::TextItem(owner,parent);
} }
#ifdef HAVE_ZINT
BaseDesignIntf * createBarcodeItem(QObject* owner, LimeReport::BaseDesignIntf* parent){ BaseDesignIntf * createBarcodeItem(QObject* owner, LimeReport::BaseDesignIntf* parent){
return new BarcodeItem(owner,parent); return new BarcodeItem(owner,parent);
} }
#endif
BaseDesignIntf* createHLayout(QObject *owner, LimeReport::BaseDesignIntf *parent) BaseDesignIntf* createHLayout(QObject *owner, LimeReport::BaseDesignIntf *parent)
{ {

4
limereport/lrscriptenginemanager.cpp
View File

@ -551,9 +551,9 @@ QString ScriptEngineManager::expandScripts(QString context, QVariant& varValue,
if (reportItem){ if (reportItem){
QScriptValue svThis = se->globalObject().property("THIS"); QScriptValue svThis = se->globalObject().property("THIS");
if (svThis.isValid()){ if (svThis.isValid()){
se->newQObject(svThis, this); se->newQObject(svThis, reportItem);
} else { } else {
svThis = se->newQObject(this); svThis = se->newQObject(reportItem);
se->globalObject().setProperty("THIS",svThis); se->globalObject().setProperty("THIS",svThis);
} }
} }