feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed
This commit is contained in:
Eike Ziller
2020-09-17 10:28:19 +02:00
parent 0d185a0ad3 364288b79c
commit 5ad724c61b
58 changed files with 2071 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp
View File

@@ -66,7 +66,10 @@ CapturedDataCommand::StateData collectStateData(ServerNodeInstance rootNodeInsta
nodeData.sceneTransform = instance.sceneTransform();
auto textProperty = instance.property("text");
if (!textProperty.isNull() && instance.holdsGraphical())
nodeData.properties.emplace_back(QString{"text"}, textProperty.toString());
nodeData.properties.emplace_back(QString{"text"}, textProperty);
auto colorProperty = instance.property("color");
if (!colorProperty.isNull())
nodeData.properties.emplace_back(QString{"color"}, colorProperty);
stateData.nodeData.push_back(std::move(nodeData));
}