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

qmlpuppet: remove qmlprivategate DesignerSupport < Qt 5.6

Browse Source 
Task-number: QTCREATORBUG-26600
Change-Id: I629c8cd1f497ed2dd354ff461aa890a77bdc2a01
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2022-07-11 14:10:13 +02:00
parent a74582a9d3
commit d6c10e775d
25 changed files with 430 additions and 2134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
View File

@@ -25,9 +25,6 @@
#include "qt5testnodeinstanceserver.h"
#include <QQuickItem>
#include <QQuickView>
#include "servernodeinstance.h"
#include "childrenchangeeventfilter.h"
#include "propertyabstractcontainer.h"
@@ -60,7 +57,10 @@
#include "dummycontextobject.h"
#include <designersupportdelegate.h>
#include <QQuickItem>
#include <QQuickView>
#include <private/qquickdesignersupport_p.h>
namespace QmlDesigner {
@@ -257,7 +257,7 @@ void Qt5TestNodeInstanceServer::removeSharedMemory(const RemoveSharedMemoryComma
void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeCommands()
{
DesignerSupport::polishItems(quickWindow());
QQuickDesignerSupport::polishItems(quickWindow());
QSet<ServerNodeInstance> informationChangedInstanceSet;
QVector<InstancePropertyPair> propertyChangedList;
@@ -272,7 +272,7 @@ void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeComm
informationChangedInstanceSet.insert(instance);
if (DesignerSupport::isDirty(item, DesignerSupport::ParentChanged)) {
if (QQuickDesignerSupport::isDirty(item, QQuickDesignerSupport::ParentChanged)) {
parentChangedSet.insert(instance);
informationChangedInstanceSet.insert(instance);
}
@@ -342,18 +342,18 @@ void Qt5TestNodeInstanceServer::sendChildrenChangedCommand(const QList<ServerNod
bool Qt5TestNodeInstanceServer::isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const
{
static DesignerSupport::DirtyType informationsDirty = DesignerSupport::DirtyType(DesignerSupport::TransformUpdateMask
| DesignerSupport::ContentUpdateMask
| DesignerSupport::Visible
| DesignerSupport::ZValue
| DesignerSupport::OpacityValue);
static QQuickDesignerSupport::DirtyType informationsDirty = QQuickDesignerSupport::DirtyType(QQuickDesignerSupport::TransformUpdateMask
| QQuickDesignerSupport::ContentUpdateMask
| QQuickDesignerSupport::Visible
| QQuickDesignerSupport::ZValue
| QQuickDesignerSupport::OpacityValue);
if (DesignerSupport::isDirty(item, informationsDirty))
if (QQuickDesignerSupport::isDirty(item, informationsDirty))
return true;
foreach (QQuickItem *childItem, item->childItems()) {
if (!hasInstanceForObject(childItem)) {
if (DesignerSupport::isDirty(childItem, informationsDirty))
if (QQuickDesignerSupport::isDirty(childItem, informationsDirty))
return true;
else if (isDirtyRecursiveForNonInstanceItems(childItem))
return true;