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

Merge tag '1.7.4' into develop

Browse Source 
Finish 1.7.4
This commit is contained in:
Arin Alex 2023-05-01 09:26:49 +03:00
commit 4f6bd2497c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/zint-2.10.0/backend_qt/qzint.h vendored
View File

@ -20,6 +20,7 @@
#define BARCODERENDER_H #define BARCODERENDER_H
#include <QColor> #include <QColor>
#include <QPainter> #include <QPainter>
#include <QObject>
#include "qzint_global.h" #include "qzint_global.h"
#include "zint.h" #include "zint.h"

4
designer/main.cpp
View File

@ -22,8 +22,8 @@ int main(int argc, char *argv[])
QString designerTranslation = QLocale(manager.getCurrentDefaultLanguage()).name(); QString designerTranslation = QLocale(manager.getCurrentDefaultLanguage()).name();
if (limeReportTranslator.load("limereport_"+designerTranslation, translationPath)){ if (limeReportTranslator.load("limereport_"+designerTranslation, translationPath)){
qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath); static_cast<void>(qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath));
qtDesignerTranslator.load("designer_"+designerTranslation,translationPath); static_cast<void>(qtDesignerTranslator.load("designer_"+designerTranslation,translationPath));
a.installTranslator(&qtBaseTranslator); a.installTranslator(&qtBaseTranslator);
a.installTranslator(&qtDesignerTranslator); a.installTranslator(&qtDesignerTranslator);

3
limereport/serializators/lrxmlwriter.cpp
View File

@ -80,7 +80,8 @@ bool XMLWriter::setContent(QString fileName)
{ {
QFile xmlFile(fileName); QFile xmlFile(fileName);
if (xmlFile.open(QFile::ReadOnly)){ if (xmlFile.open(QFile::ReadOnly)){
return m_doc->setContent(&xmlFile); m_doc->setContent(&xmlFile);
return true;
} }
return false; return false;
} }