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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/plugins/clangtools/clangtoolssettings.cpp
	src/plugins/clangtools/executableinfo.cpp
	src/plugins/clangtools/executableinfo.h

Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
This commit is contained in:
Eike Ziller
2021-09-13 15:36:51 +02:00
parent c941f7d0f5 7e965629b0
commit 3d4d7c7e14
98 changed files with 1321 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
View File

@@ -149,6 +149,12 @@ ServerNodeInstance Qt5RenderNodeInstanceServer::findNodeInstanceForItem(QQuickIt
return ServerNodeInstance();
}
void Qt5RenderNodeInstanceServer::resizeCanvasToRootItem()
{
Qt5NodeInstanceServer::resizeCanvasToRootItem();
m_dirtyInstanceSet.insert(rootNodeInstance());
}
void Qt5RenderNodeInstanceServer::createScene(const CreateSceneCommand &command)
{

1
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
View File

@@ -43,6 +43,7 @@ public:
protected:
void collectItemChangesAndSendChangeCommands() override;
ServerNodeInstance findNodeInstanceForItem(QQuickItem *item) const;
void resizeCanvasToRootItem() override;
private:
QSet<ServerNodeInstance> m_dirtyInstanceSet;