mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 00:33:02 +03:00
Merge tag '1.7.4' into develop
Finish 1.7.4
This commit is contained in:
commit
4f6bd2497c
1
3rdparty/zint-2.10.0/backend_qt/qzint.h
vendored
1
3rdparty/zint-2.10.0/backend_qt/qzint.h
vendored
@ -20,6 +20,7 @@
|
||||
#define BARCODERENDER_H
|
||||
#include <QColor>
|
||||
#include <QPainter>
|
||||
#include <QObject>
|
||||
|
||||
#include "qzint_global.h"
|
||||
#include "zint.h"
|
||||
|
@ -22,8 +22,8 @@ int main(int argc, char *argv[])
|
||||
QString designerTranslation = QLocale(manager.getCurrentDefaultLanguage()).name();
|
||||
|
||||
if (limeReportTranslator.load("limereport_"+designerTranslation, translationPath)){
|
||||
qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath);
|
||||
qtDesignerTranslator.load("designer_"+designerTranslation,translationPath);
|
||||
static_cast<void>(qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath));
|
||||
static_cast<void>(qtDesignerTranslator.load("designer_"+designerTranslation,translationPath));
|
||||
|
||||
a.installTranslator(&qtBaseTranslator);
|
||||
a.installTranslator(&qtDesignerTranslator);
|
||||
|
@ -80,7 +80,8 @@ bool XMLWriter::setContent(QString fileName)
|
||||
{
|
||||
QFile xmlFile(fileName);
|
||||
if (xmlFile.open(QFile::ReadOnly)){
|
||||
return m_doc->setContent(&xmlFile);
|
||||
m_doc->setContent(&xmlFile);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user