From 7e1b3374fe6e4c1321a68e9879fd97e289e4ca57 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 30 Nov 2017 21:23:51 +0300 Subject: [PATCH] windows build fixed --- designer_plugin/designer_plugin.pro | 4 +- designer_plugin/limereport.pri | 61 ++++++++++++++++++++++-- limereport/items/lrchartitemeditor.cpp | 2 +- limereport/lrbasedesignintf.cpp | 2 - limereport/scripteditor/lrcodeeditor.cpp | 1 - 5 files changed, 60 insertions(+), 10 deletions(-) diff --git a/designer_plugin/designer_plugin.pro b/designer_plugin/designer_plugin.pro index 9c0ebcb..cfcbb39 100644 --- a/designer_plugin/designer_plugin.pro +++ b/designer_plugin/designer_plugin.pro @@ -3,9 +3,9 @@ include(limereport.pri) QT += core gui contains(CONFIG,release) { - TARGET = LRDesigner_plugin + TARGET = designer_plugin } else { - TARGET = LRDesigner_plugind + TARGET = designer_plugind } TEMPLATE = lib diff --git a/designer_plugin/limereport.pri b/designer_plugin/limereport.pri index 72b19ba..a03de48 100644 --- a/designer_plugin/limereport.pri +++ b/designer_plugin/limereport.pri @@ -80,7 +80,30 @@ SOURCES += \ $$REPORT_PATH/lritemscontainerdesignitf.cpp \ $$REPORT_PATH/lrcolorindicator.cpp \ $$REPORT_PATH/lrreporttranslation.cpp \ - $$REPORT_PATH/translationeditor/languageselectdialog.cpp + $$REPORT_PATH/translationeditor/languageselectdialog.cpp \ + $$REPORT_PATH/serializators/lrxmlqrectserializator.cpp \ + $$REPORT_PATH/serializators/lrxmlbasetypesserializators.cpp \ + $$REPORT_PATH/serializators/lrxmlreader.cpp \ + $$REPORT_PATH/serializators/lrxmlwriter.cpp \ + $$REPORT_PATH/bands/lrpageheader.cpp \ + $$REPORT_PATH/bands/lrpagefooter.cpp \ + $$REPORT_PATH/bands/lrreportheader.cpp \ + $$REPORT_PATH/bands/lrreportfooter.cpp \ + $$REPORT_PATH/bands/lrdataband.cpp \ + $$REPORT_PATH/bands/lrgroupbands.cpp \ + $$REPORT_PATH/bands/lrsubdetailband.cpp \ + $$REPORT_PATH/bands/lrtearoffband.cpp \ + $$REPORT_PATH/lrgraphicsviewzoom.cpp \ + $$REPORT_PATH/lrvariablesholder.cpp \ + $$REPORT_PATH/lrgroupfunctions.cpp \ + $$REPORT_PATH/lrsimplecrypt.cpp \ + $$REPORT_PATH/items/lrsimpletagparser.cpp \ + $$REPORT_PATH/items/lrtextitem.cpp \ + $$REPORT_PATH/items/lrtextitemeditor.cpp \ + $$REPORT_PATH/lrreportengine.cpp \ + $$REPORT_PATH/lrpreviewreportwindow.cpp \ + $$REPORT_PATH/lrpreviewreportwidget.cpp \ + $$REPORT_PATH/lrreportrender.cpp HEADERS += \ $$REPORT_PATH/base/lrsingleton.h \ @@ -127,6 +150,7 @@ HEADERS += \ $$REPORT_PATH/items/editors/lritemsaligneditorwidget.h \ $$REPORT_PATH/items/editors/lritemsborderseditorwidget.h \ $$REPORT_PATH/items/lrtextitem.h \ + $$REPORT_PATH/items/lrtextitemeditor.h \ $$REPORT_PATH/items/lrsubitemparentpropitem.h \ $$REPORT_PATH/items/lralignpropitem.h \ $$REPORT_PATH/items/lrhorizontallayout.h \ @@ -154,9 +178,37 @@ HEADERS += \ $$REPORT_PATH/lritemscontainerdesignitf.h \ $$REPORT_PATH/lrcolorindicator.h \ $$REPORT_PATH/lrreporttranslation.h \ - $$REPORT_PATH/translationeditor/languageselectdialog.h + $$REPORT_PATH/translationeditor/languageselectdialog.h \ + $$REPORT_PATH/serializators/lrserializatorintf.h \ + $$REPORT_PATH/serializators/lrstorageintf.h \ + $$REPORT_PATH/serializators/lrxmlqrectserializator.h \ + $$REPORT_PATH/serializators/lrxmlserializatorsfactory.h \ + $$REPORT_PATH/serializators/lrxmlbasetypesserializators.h \ + $$REPORT_PATH/serializators/lrxmlreader.h \ + $$REPORT_PATH/serializators/lrxmlwriter.h \ + $$REPORT_PATH/bands/lrpageheader.h \ + $$REPORT_PATH/bands/lrpagefooter.h \ + $$REPORT_PATH/bands/lrreportheader.h \ + $$REPORT_PATH/bands/lrreportfooter.h \ + $$REPORT_PATH/bands/lrdataband.h \ + $$REPORT_PATH/bands/lrtearoffband.h \ + $$REPORT_PATH/bands/lrsubdetailband.h \ + $$REPORT_PATH/bands/lrgroupbands.h \ + $$REPORT_PATH/lrvariablesholder.h \ + $$REPORT_PATH/lrgroupfunctions.h \ + $$REPORT_PATH/lrgraphicsviewzoom.h \ + $$REPORT_PATH/lrsimplecrypt.h \ + $$REPORT_PATH/items/lrsimpletagparser.h \ + $$REPORT_PATH/items/lrtextitem.h \ + $$REPORT_PATH/lrreportengine_p.h \ + $$REPORT_PATH/lrreportengine.h \ + $$REPORT_PATH/lrpreviewreportwindow.h \ + $$REPORT_PATH/lrpreviewreportwidget.h \ + $$REPORT_PATH/lrreportrender.h FORMS += \ + $$REPORT_PATH/items/lrtextitemeditor.ui \ + $$REPORT_PATH/items/lrchartitemeditor.ui \ $$REPORT_PATH/databrowser/lrsqleditdialog.ui \ $$REPORT_PATH/databrowser/lrconnectiondialog.ui \ $$REPORT_PATH/databrowser/lrdatabrowser.ui \ @@ -167,8 +219,9 @@ FORMS += \ $$REPORT_PATH/scriptbrowser/lrscriptbrowser.ui \ $$REPORT_PATH/translationeditor/translationeditor.ui \ $$REPORT_PATH/translationeditor/languageselectdialog.ui \ - $$REPORT_PATH/scripteditor/lrscripteditor.ui - + $$REPORT_PATH/scripteditor/lrscripteditor.ui \ + $$REPORT_PATH/lrpreviewreportwindow.ui \ + $$REPORT_PATH/lrpreviewreportwidget.ui RESOURCES += \ $$REPORT_PATH/objectinspector/lobjectinspector.qrc \ $$REPORT_PATH/databrowser/lrdatabrowser.qrc \ diff --git a/limereport/items/lrchartitemeditor.cpp b/limereport/items/lrchartitemeditor.cpp index cb13541..441400d 100644 --- a/limereport/items/lrchartitemeditor.cpp +++ b/limereport/items/lrchartitemeditor.cpp @@ -41,7 +41,7 @@ QSettings* ChartItemEditor::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; } diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp index b4c0d5b..28c867b 100644 --- a/limereport/lrbasedesignintf.cpp +++ b/limereport/lrbasedesignintf.cpp @@ -365,11 +365,9 @@ void BaseDesignIntf::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { m_resizeDirectionFlags = resizeDirectionFlags(event->pos()); - //m_startScenePos = event->scenePos(); m_startPos = pos(); m_oldGeometry = geometry(); QGraphicsItem::mousePressEvent(event); - //QApplication::processEvents(); emit(itemSelected(this)); } else QGraphicsItem::mousePressEvent(event); diff --git a/limereport/scripteditor/lrcodeeditor.cpp b/limereport/scripteditor/lrcodeeditor.cpp index 57a9d69..4e524c1 100644 --- a/limereport/scripteditor/lrcodeeditor.cpp +++ b/limereport/scripteditor/lrcodeeditor.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include "lrscripthighlighter.h"