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

windows build fixed

Browse Source
This commit is contained in:
Arin Alexander 2017-11-30 21:23:11 +03:00
parent 911eb1102a
commit ff55e10e9d
11 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
designer_plugin/lrdesignerplugin.cpp
View File

@ -12,6 +12,6 @@ LimeReport::ReportDesignWindowInterface* ReportDesignerFactoryPlugin::getDesigne
}
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( LimeReportPluginInterface, DesignerFactoryPlugin )
Q_EXPORT_PLUGIN2(LimeReportPluginInterface, ReportDesignerFactoryPlugin)
#endif

2
designer_plugin/lrdesignerplugin.h
View File

@ -6,7 +6,9 @@
class ReportDesignerFactoryPlugin : public QObject, public LimeReportPluginInterface {
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "ru.limereport.DersignerFactoryInterface")
#endif
Q_INTERFACES( LimeReportPluginInterface )
public:

23
include/lrreportdesignwindowintrerface.h Normal file
View File

@ -0,0 +1,23 @@
#ifndef LRREPORTDESIGNWINDOWINTRERFACE_H
#define LRREPORTDESIGNWINDOWINTRERFACE_H
#include <QMainWindow>
#include <QSettings>
namespace LimeReport {
class ReportDesignWindowInterface: public QMainWindow{
public:
ReportDesignWindowInterface(QWidget* parent = 0): QMainWindow(parent){}
virtual bool checkNeedToSave() = 0;
virtual void showModal() = 0;
virtual void showNonModal() = 0;
virtual void setSettings(QSettings* value) = 0;
virtual QSettings* settings() = 0;
virtual void restoreSetting() = 0;
virtual void setShowProgressDialog(bool value) = 0;
};
} // namespace LimeReport
#endif // LRREPORTDESIGNWINDOWINTRERFACE_H

2
limereport/databrowser/lrdatabrowser.cpp
View File

@ -277,7 +277,7 @@ QSettings *DataBrowser::settings()
if (m_settings){
return m_settings;
} else {
m_settings = new QSettings("LimeReport",QApplication::applicationName());
m_settings = new QSettings("LimeReport",QCoreApplication::applicationName());
m_ownedSettings = true;
return m_settings;
}

2
limereport/databrowser/lrsqleditdialog.cpp
View File

@ -78,7 +78,7 @@ QSettings *SQLEditDialog::settings(){
if (m_settings){
return m_settings;
} else {
m_settings = new QSettings("LimeReport",QApplication::applicationName());
m_settings = new QSettings("LimeReport",QCoreApplication::applicationName());
m_ownedSettings = true;
return m_settings;
}

1
limereport/items/lrtextitem.cpp
View File

@ -483,7 +483,6 @@ TextItem::TextPtr TextItem::textDocument() const
QTextOption to;
to.setAlignment(m_alignment);
to.setTextDirection(m_textLayoutDirection);
//to.setTextDirection(QApplication::layoutDirection());
if (m_autoWidth!=MaxStringLength)
if (m_adaptFontToSize && (!(m_autoHeight || m_autoWidth)))

2
limereport/items/lrtextitemeditor.cpp
View File

@ -76,7 +76,7 @@ QSettings*TextItemEditor::settings()
if (m_settings){
return m_settings;
} else {
m_settings = new QSettings("LimeReport",QApplication::applicationName());
m_settings = new QSettings("LimeReport",QCoreApplication::applicationName());
m_ownedSettings = true;
return m_settings;
}

2
limereport/lrpreviewreportwindow.cpp
View File

@ -183,7 +183,7 @@ QSettings*PreviewReportWindow::settings()
if (m_settings){
return m_settings;
} else {
m_settings = new QSettings("LimeReport",QApplication::applicationName());
m_settings = new QSettings("LimeReport",QCoreApplication::applicationName());
m_ownedSettings = true;
return m_settings;
}

8
limereport/lrreportengine.cpp
View File

@ -92,11 +92,15 @@ 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( "./lib" );
QDir pluginsDir = QCoreApplication::applicationDirPath();
pluginsDir.cd("../lib" );
if (!pluginsDir.exists()){
pluginsDir.setPath("../lib");
pluginsDir.cd("./lib");
if (!pluginsDir.exists()) pluginsDir.setPath(QCoreApplication::applicationDirPath());
}
qDebug()<<pluginsDir.path();
foreach( const QString& pluginName, pluginsDir.entryList( QDir::Files ) ) {
QPluginLoader loader( pluginsDir.absoluteFilePath( pluginName ) );
if( loader.load() ) {

3
limereport/lrreportrender.cpp
View File

@ -29,7 +29,6 @@
****************************************************************************/
#include <stdexcept>
#include <QMessageBox>
#include <QApplication>
#include "lrglobal.h"
#include "lrreportrender.h"
@ -411,7 +410,7 @@ void ReportRender::replaceGroupsFunction(BandDesignIntf *band)
BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesignIntf* bandData, ReportRender::DataRenderMode mode, bool isLast)
{
QApplication::processEvents();
QCoreApplication::processEvents();
if (patternBand){
BandDesignIntf* bandClone = 0;

1
limereport/objectinspector/propertyItems/lrflagspropitem.cpp
View File

@ -35,7 +35,6 @@
#include <QIcon>
#include <QImage>
#include <QPainter>
#include <QApplication>
#include <QStyle>
#include <QStylePainter>