feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
80e2eddd957bbb35a2197e5a869871017592f7a9
qt-creator/share/qtcreator/qml/qmlpuppet/qml2puppet/instances
History
Tim Jenssen 80e2eddd95 Merge remote-tracking branch 'origin/8.0' 
resolved conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/designercore/exceptions/exception.cpp

Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
2022-09-22 10:32:40 +02:00
..
anchorchangesnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
anchorchangesnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
animationdriver.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
animationdriver.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
behaviornodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
behaviornodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
capturenodeinstanceserverdispatcher.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
capturenodeinstanceserverdispatcher.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
childrenchangeeventfilter.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
childrenchangeeventfilter.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
componentnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
componentnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
dummycontextobject.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
dummycontextobject.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
dummynodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
dummynodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
instances.pri
QmlDesigner: Show form editor preview for 3D material root nodes
2022-05-27 08:49:14 +00:00
layoutnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
layoutnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
nodeinstanceserver.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
nodeinstanceserver.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
nodeinstanceserverdispatcher.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
nodeinstanceserverdispatcher.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
nodeinstancesignalspy.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
nodeinstancesignalspy.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
objectnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
objectnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
positionernodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
positionernodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qmlpropertychangesnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qmlpropertychangesnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qmlstatenodeinstance.cpp
Merge remote-tracking branch 'origin/8.0'
2022-09-19 09:54:06 +02:00
qmlstatenodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qmltransitionnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qmltransitionnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt3dpresentationnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt3dpresentationnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5captureimagenodeinstanceserver.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5captureimagenodeinstanceserver.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5capturepreviewnodeinstanceserver.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5capturepreviewnodeinstanceserver.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5informationnodeinstanceserver.cpp
Merge remote-tracking branch 'origin/8.0'
2022-09-19 09:54:06 +02:00
qt5informationnodeinstanceserver.h
Merge remote-tracking branch 'origin/8.0'
2022-09-13 11:15:16 +02:00
qt5nodeinstanceclientproxy.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5nodeinstanceclientproxy.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5nodeinstanceserver.cpp
Merge remote-tracking branch 'origin/8.0'
2022-08-31 11:03:13 +02:00
qt5nodeinstanceserver.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5previewnodeinstanceserver.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5previewnodeinstanceserver.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5rendernodeinstanceserver.cpp
Merge remote-tracking branch 'origin/8.0'
2022-09-22 10:32:40 +02:00
qt5rendernodeinstanceserver.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5testnodeinstanceserver.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
qt5testnodeinstanceserver.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quick3dmaterialnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quick3dmaterialnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quick3dnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quick3dnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quick3drenderablenodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quick3drenderablenodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quick3dtexturenodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quick3dtexturenodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quickitemnodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
quickitemnodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
servernodeinstance.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
servernodeinstance.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
viewconfig.cpp
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00
viewconfig.h
Use SPDX license identifiers
2022-08-26 12:27:18 +00:00