mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00
Code

Static build has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2017-06-14 12:07:40 +03:00
commit 9e5125c8fb
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -61,7 +61,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 = 8 LIMEREPORT_VERSION_RELEASE = 17
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}\"

4
limereport/limereport.pri
View File

@ -96,7 +96,7 @@ SOURCES += \
$$REPORT_PATH/lrsettingdialog.cpp \ $$REPORT_PATH/lrsettingdialog.cpp \
$$REPORT_PATH/lritemscontainerdesignitf.cpp $$REPORT_PATH/lritemscontainerdesignitf.cpp
contains(CONFIG, staticbuild){ contains(CONFIG, staticlib){
SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp
} }
@ -201,7 +201,7 @@ HEADERS += \
$$REPORT_PATH/lrpreviewreportwidget_p.h \ $$REPORT_PATH/lrpreviewreportwidget_p.h \
$$REPORT_PATH/lritemscontainerdesignitf.h $$REPORT_PATH/lritemscontainerdesignitf.h
contains(CONFIG, staticbuild){ contains(CONFIG, staticlib){
HEADERS += $$REPORT_PATH/lrfactoryinitializer.h HEADERS += $$REPORT_PATH/lrfactoryinitializer.h
} }

7
limereport/limereport.pro
View File

@ -13,13 +13,12 @@ macx{
CONFIG += plugin CONFIG += plugin
} }
!staticlib:{ DEFINES += LIMEREPORT_EXPORTS
DEFINES += LIMEREPORT_EXPORTS
}
staticlib:{ contains(CONFIG, staticlib){
DEFINES += HAVE_STATIC_BUILD DEFINES += HAVE_STATIC_BUILD
message(STATIC_BUILD) message(STATIC_BUILD)
DEFINES -= LIMEREPORT_EXPORTS
} }
EXTRA_FILES += \ EXTRA_FILES += \

1
limereport/lrfactoryinitializer.h
View File

@ -1,3 +1,4 @@
void initResources();
namespace LimeReport{ namespace LimeReport{
void initReportItems(); void initReportItems();
void initObjectInspectorProperties(); void initObjectInspectorProperties();

1
limereport/lrreportengine.cpp
View File

@ -67,6 +67,7 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) :
m_fileWatcher( new QFileSystemWatcher( this ) ) m_fileWatcher( new QFileSystemWatcher( this ) )
{ {
#ifdef HAVE_STATIC_BUILD #ifdef HAVE_STATIC_BUILD
initResources();
initReportItems(); initReportItems();
initObjectInspectorProperties(); initObjectInspectorProperties();
initSerializators(); initSerializators();