kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '77710e1cc5e597d06196d2ee163198176032987a'

Browse Source 
Conflicts:
	sources/conductorproperties.cpp
	sources/qetgraphicsitem/element.cpp
	sources/qetgraphicsitem/qetshapeitem.cpp
This commit is contained in:
Martin Marmsoler
2021-02-27 07:49:24 +01:00
parent f499507b2d 77710e1cc5
commit 01d6cdb920
17 changed files with 47 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/conductorproperties.cpp
View File

@@ -391,7 +391,6 @@ bool ConductorProperties::fromXml(const QDomElement &e)
propertyDouble(e, "horizrotatetext", &horiz_rotate_text);
QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
QString alinment_temp;
if (propertyString(e, "horizontal-alignment", &alinment_temp) == PropertyFlags::Success)
m_horizontal_alignment = Qt::Alignment(me.keyToValue(alinment_temp.toStdString().data()));