aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem.cpp
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2021-05-11 10:25:05 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2021-05-11 14:40:00 +0200
commitcb25a1d13d331a5b26d5dac963cd88497264c770 (patch)
tree87d49a5dd7ba1f31ca9c375aee7a56e83cfbae32 /src/quick/items/qquickitem.cpp
parentd1ef9f277c750b706b16fba28ce9cc7ea96089ac (diff)
QQuickItem: Remove remnant from Quick 1 times
Quick 1 does no longer exist, so it should be impossible to add a QGraphicsItem to the scene in any case. Change-Id: I987e66dc11d737e6ca0adbc0090f8633634865c7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r--src/quick/items/qquickitem.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 6bcd7da92a..eed3f8daae 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -3247,9 +3247,7 @@ void QQuickItemPrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o)
if (QQuickItem *item = qmlobject_cast<QQuickItem *>(o)) {
item->setParentItem(that);
} else {
- if (o->inherits("QGraphicsItem"))
- qWarning("Cannot add a QtQuick 1.0 item (%s) into a QtQuick 2.0 scene!", o->metaObject()->className());
- else if (QQuickPointerHandler *pointerHandler = qmlobject_cast<QQuickPointerHandler *>(o)) {
+ if (QQuickPointerHandler *pointerHandler = qmlobject_cast<QQuickPointerHandler *>(o)) {
if (pointerHandler->parent() != that) {
qCDebug(lcHandlerParent) << "reparenting handler" << pointerHandler << ":" << pointerHandler->parent() << "->" << that;
pointerHandler->setParent(that);