diff --git a/common.pri b/common.pri index 5af0a16..baea82d 100644 --- a/common.pri +++ b/common.pri @@ -59,7 +59,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 8 +LIMEREPORT_VERSION_RELEASE = 17 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/limereport/limereport.pri b/limereport/limereport.pri index 25568a7..d20810d 100644 --- a/limereport/limereport.pri +++ b/limereport/limereport.pri @@ -92,7 +92,7 @@ SOURCES += \ $$REPORT_PATH/scriptbrowser/lrscriptbrowser.cpp \ $$REPORT_PATH/lritemscontainerdesignitf.cpp -contains(CONFIG, staticbuild){ +contains(CONFIG, staticlib){ SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp } @@ -197,7 +197,7 @@ HEADERS += \ $$REPORT_PATH/scriptbrowser/lrscriptbrowser.h \ $$REPORT_PATH/lritemscontainerdesignitf.h -contains(CONFIG, staticbuild){ +contains(CONFIG, staticlib){ HEADERS += $$REPORT_PATH/lrfactoryinitializer.h } diff --git a/limereport/limereport.pro b/limereport/limereport.pro index 356cde3..5af5676 100644 --- a/limereport/limereport.pro +++ b/limereport/limereport.pro @@ -13,13 +13,12 @@ macx{ CONFIG += plugin } -!staticlib:{ - DEFINES += LIMEREPORT_EXPORTS -} +DEFINES += LIMEREPORT_EXPORTS -staticlib:{ +contains(CONFIG, staticlib){ DEFINES += HAVE_STATIC_BUILD message(STATIC_BUILD) + DEFINES -= LIMEREPORT_EXPORTS } EXTRA_FILES += \ diff --git a/limereport/lrfactoryinitializer.h b/limereport/lrfactoryinitializer.h index add7eab..679d657 100644 --- a/limereport/lrfactoryinitializer.h +++ b/limereport/lrfactoryinitializer.h @@ -1,3 +1,4 @@ +void initResources(); namespace LimeReport{ void initReportItems(); void initObjectInspectorProperties(); diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index 641e3eb..d99bff6 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -66,6 +66,7 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) : m_fileWatcher( new QFileSystemWatcher( this ) ) { #ifdef HAVE_STATIC_BUILD + initResources(); initReportItems(); initObjectInspectorProperties(); initSerializators();