From 682b2d953fe6bd4b125ef35f685c572ff34d2857 Mon Sep 17 00:00:00 2001 From: Erfan Huda Date: Thu, 27 Apr 2023 22:39:35 +0700 Subject: [PATCH 1/2] Update qzint.h on Update the missing includepath of QObject in line 3X. --- 3rdparty/zint-2.10.0/backend_qt/qzint.h | 1 + 1 file changed, 1 insertion(+) diff --git a/3rdparty/zint-2.10.0/backend_qt/qzint.h b/3rdparty/zint-2.10.0/backend_qt/qzint.h index b63262c..9c8da28 100644 --- a/3rdparty/zint-2.10.0/backend_qt/qzint.h +++ b/3rdparty/zint-2.10.0/backend_qt/qzint.h @@ -20,6 +20,7 @@ #define BARCODERENDER_H #include #include +#include #include "qzint_global.h" #include "zint.h" From f1903147a62ac8d6ba7ea37e489160b2b32fd7a7 Mon Sep 17 00:00:00 2001 From: Arin Alex Date: Mon, 1 May 2023 09:26:41 +0300 Subject: [PATCH 2/2] return value has been fixed --- designer/main.cpp | 4 ++-- limereport/serializators/lrxmlwriter.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/designer/main.cpp b/designer/main.cpp index e0478c9..485de4a 100644 --- a/designer/main.cpp +++ b/designer/main.cpp @@ -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(qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath)); + static_cast(qtDesignerTranslator.load("designer_"+designerTranslation,translationPath)); a.installTranslator(&qtBaseTranslator); a.installTranslator(&qtDesignerTranslator); diff --git a/limereport/serializators/lrxmlwriter.cpp b/limereport/serializators/lrxmlwriter.cpp index fdae62c..d07d8b8 100644 --- a/limereport/serializators/lrxmlwriter.cpp +++ b/limereport/serializators/lrxmlwriter.cpp @@ -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; }