Merge branch 'master' into qt6_cmake_joshua

This commit is contained in:
joshua
2026-07-31 21:15:21 +02:00
parent f16cf7dac8
commit e6d29cf345
297 changed files with 82691 additions and 27463 deletions
+3 -2
View File
@@ -18,6 +18,7 @@
#include "qetxml.h"
#include "NameList/nameslist.h"
#include "utils/qetutils.h"
#include <QDir>
#include <QFont>
@@ -470,7 +471,7 @@ QDomElement QETXML::modelHeaderDataToXml(
else if (role == Qt::FontRole)
{
auto font = variant.value<QFont>();
text_node.setData(font.toString());
text_node.setData(QETUtils::fontToString(font));
}
else if (role == Qt::TextAlignmentRole)
{
@@ -536,7 +537,7 @@ void QETXML::modelHeaderDataFromXml(
else if (role_ == Qt::FontRole)
{
QFont font;
font.fromString(text_);
QETUtils::fontFromString(font, text_);
data_ = font;
}
else if (role_ == Qt::TextAlignmentRole)