mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-03 03:57:31 +03:00
Code Activity

Merge tag '1.5.85' into develop

Browse Source 
Finish 1.5.85

# Conflicts:
#	common.pri
This commit is contained in:
Arin Alexander
2021-04-14 21:23:28 +03:00
parent 51d242b897 520d223956
commit 1cbab7e0e4
3 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
limereport/limereport.pri
View File

@@ -10,6 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
contains(CONFIG, embedded_designer){
include(designer.pri)
message(embedded designer)
}
DEFINES += INSPECT_BASEDESIGN

35
limereport/lrreportengine.cpp
View File

@@ -110,25 +110,28 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) :
connect(m_datasources,SIGNAL(loadCollectionFinished(QString)),this,SLOT(slotDataSourceCollectionLoaded(QString)));
connect(m_fileWatcher,SIGNAL(fileChanged(const QString &)),this,SLOT(slotLoadFromFile(const QString &)));
QDir pluginsDir = QCoreApplication::applicationDirPath();
pluginsDir.cd("../lib" );
if (!pluginsDir.exists()){
pluginsDir.cd("./lib");
if (!pluginsDir.exists()) pluginsDir.setPath(QCoreApplication::applicationDirPath());
}
foreach( const QString& pluginName, pluginsDir.entryList( QDir::Files ) ) {
QPluginLoader loader( pluginsDir.absoluteFilePath( pluginName ) );
if( loader.load() ) {
#ifndef HAVE_REPORT_DESIGNER
if( LimeReportDesignerPluginInterface* designerPlugin = qobject_cast< LimeReportDesignerPluginInterface* >( loader.instance() ) ) {
m_designerFactory = designerPlugin;
break;
}
#endif
}
QDir pluginsDir = QCoreApplication::applicationDirPath();
if (!pluginsDir.cd("../lib" )){
pluginsDir.cd("./lib");
}
if (pluginsDir != QCoreApplication::applicationDirPath()){
foreach( const QString& pluginName, pluginsDir.entryList( QDir::Files ) ) {
QPluginLoader loader( pluginsDir.absoluteFilePath( pluginName ) );
if( loader.load() ) {
if( LimeReportDesignerPluginInterface* designerPlugin = qobject_cast< LimeReportDesignerPluginInterface* >( loader.instance() ) ) {
m_designerFactory = designerPlugin;
break;
}
}
}
}
#endif
}
ReportEnginePrivate::~ReportEnginePrivate()