1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QGraphicsView: remove even more vestiges of QtDeclarative1

Browse Source 
The field is never set and thus never used meaningfully.

Change-Id: Ia45afa6339d38316d76766a736ba8cb1ce9f58fa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2023-01-18 00:47:28 +01:00
parent 7981501298
commit 002d95dc85
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/graphicsview/qgraphicsitem.cpp
View File

@ -904,7 +904,6 @@ QGraphicsItemPrivate::QGraphicsItemPrivate()
scenePosDescendants(false), scenePosDescendants(false),
pendingPolish(false), pendingPolish(false),
mayHaveChildWithGraphicsEffect(false), mayHaveChildWithGraphicsEffect(false),
isDeclarativeItem(false),
sendParentChangeNotification(false), sendParentChangeNotification(false),
dirtyChildrenBoundingRect(true), dirtyChildrenBoundingRect(true),
globalStackingOrder(-1), globalStackingOrder(-1),

3
src/widgets/graphicsview/qgraphicsitem_p.h
View File

@ -415,10 +415,9 @@ public:
quint32 scenePosDescendants : 1; quint32 scenePosDescendants : 1;
quint32 pendingPolish : 1; quint32 pendingPolish : 1;
quint32 mayHaveChildWithGraphicsEffect : 1; quint32 mayHaveChildWithGraphicsEffect : 1;
quint32 isDeclarativeItem : 1;
quint32 sendParentChangeNotification : 1; quint32 sendParentChangeNotification : 1;
quint32 dirtyChildrenBoundingRect : 1; quint32 dirtyChildrenBoundingRect : 1;
quint32 padding : 19; quint32 padding : 20;
// Optional stacking order // Optional stacking order
int globalStackingOrder; int globalStackingOrder;

4
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -2417,16 +2417,12 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
return; return;
} }
// QDeclarativeItems do not rely on initial itemChanged message, as the componentComplete
// function allows far more opportunity for delayed-construction optimization.
if (!item->d_ptr->isDeclarativeItem) {
if (d->unpolishedItems.isEmpty()) { if (d->unpolishedItems.isEmpty()) {
QMetaMethod method = metaObject()->method(d->polishItemsIndex); QMetaMethod method = metaObject()->method(d->polishItemsIndex);
method.invoke(this, Qt::QueuedConnection); method.invoke(this, Qt::QueuedConnection);
} }
d->unpolishedItems.append(item); d->unpolishedItems.append(item);
item->d_ptr->pendingPolish = true; item->d_ptr->pendingPolish = true;
}
// Detach this item from its parent if the parent's scene is different // Detach this item from its parent if the parent's scene is different
// from this scene. // from this scene.