summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-08-25 14:47:07 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2016-09-30 12:43:18 +0000
commit3763008370833508104dbf2ed8296e8925207563 (patch)
treedcdb33fc6b35bcdf3917c78f2190c0c6786e84c9
parentc1581dbbafe001f1c6e92ebb55fdeed137b12d29 (diff)
Fix vtable for QQuickPaintedItem
As mentioned in QTBUG-54404 this is an unfortunate breakage we choose to accept. Change-Id: Id511188a2dcd35e8e16e7651c9764c8be1b5afb1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
-rw-r--r--tests/auto/bic/data/QtQuick.5.6.0.linux-gcc-amd64.txt2
-rw-r--r--tests/auto/bic/data/QtQuickWidgets.5.6.0.linux-gcc-amd64.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/bic/data/QtQuick.5.6.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtQuick.5.6.0.linux-gcc-amd64.txt
index 9157992bf8..93e47dc1bd 100644
--- a/tests/auto/bic/data/QtQuick.5.6.0.linux-gcc-amd64.txt
+++ b/tests/auto/bic/data/QtQuick.5.6.0.linux-gcc-amd64.txt
@@ -9142,7 +9142,7 @@ QQuickPaintedItem::_ZTV17QQuickPaintedItem: 56u entries
136 (int (*)(...))QQuickItem::inputMethodQuery
144 (int (*)(...))QQuickPaintedItem::isTextureProvider
152 (int (*)(...))QQuickPaintedItem::textureProvider
-160 (int (*)(...))QQuickItem::itemChange
+160 (int (*)(...))QQuickPaintedItem::itemChange
168 (int (*)(...))QQuickItem::classBegin
176 (int (*)(...))QQuickItem::componentComplete
184 (int (*)(...))QQuickItem::keyPressEvent
diff --git a/tests/auto/bic/data/QtQuickWidgets.5.6.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtQuickWidgets.5.6.0.linux-gcc-amd64.txt
index 9beedebfd0..1a3255e0a5 100644
--- a/tests/auto/bic/data/QtQuickWidgets.5.6.0.linux-gcc-amd64.txt
+++ b/tests/auto/bic/data/QtQuickWidgets.5.6.0.linux-gcc-amd64.txt
@@ -9142,7 +9142,7 @@ QQuickPaintedItem::_ZTV17QQuickPaintedItem: 56u entries
136 (int (*)(...))QQuickItem::inputMethodQuery
144 (int (*)(...))QQuickPaintedItem::isTextureProvider
152 (int (*)(...))QQuickPaintedItem::textureProvider
-160 (int (*)(...))QQuickItem::itemChange
+160 (int (*)(...))QQuickPaintedItem::itemChange
168 (int (*)(...))QQuickItem::classBegin
176 (int (*)(...))QQuickItem::componentComplete
184 (int (*)(...))QQuickItem::keyPressEvent