mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-07 05:44:14 +02:00
Merge branch 'master' into qt6_cmake_joshua
This commit is contained in:
+3
-2
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user