From 34b57dc767268ba315ac54fd3f2c8e9c1104c66f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 26 May 2015 22:16:25 +0200 Subject: [PATCH] QGraphicsTransformPrivate: declare dtor out-of-line and export class De-duplicates vtables and enables RTTI on this class hierarchy. Export, as QDeclarativeTranslatePrivate (QtQuick1) inherits it. Change-Id: I32439c59f7d4bff466ecae969bb761a42c3837f1 Reported-by: Volker Krause Task-number: QTBUG-45582 Reviewed-by: Lars Knoll --- src/widgets/graphicsview/qgraphicstransform.cpp | 5 +++++ src/widgets/graphicsview/qgraphicstransform_p.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/widgets/graphicsview/qgraphicstransform.cpp b/src/widgets/graphicsview/qgraphicstransform.cpp index 67564b5a8b7..fe963fbf3cb 100644 --- a/src/widgets/graphicsview/qgraphicstransform.cpp +++ b/src/widgets/graphicsview/qgraphicstransform.cpp @@ -89,6 +89,11 @@ #ifndef QT_NO_GRAPHICSVIEW QT_BEGIN_NAMESPACE + +QGraphicsTransformPrivate::~QGraphicsTransformPrivate() +{ +} + void QGraphicsTransformPrivate::setItem(QGraphicsItem *i) { if (item == i) diff --git a/src/widgets/graphicsview/qgraphicstransform_p.h b/src/widgets/graphicsview/qgraphicstransform_p.h index dde085935fd..c81a95fd3d6 100644 --- a/src/widgets/graphicsview/qgraphicstransform_p.h +++ b/src/widgets/graphicsview/qgraphicstransform_p.h @@ -51,12 +51,14 @@ QT_BEGIN_NAMESPACE class QGraphicsItem; -class QGraphicsTransformPrivate : public QObjectPrivate { +// ### Qt 6: unexport again, if QtQuick1's QDeclarativeTranslatePrivate is gone by then +class Q_WIDGETS_EXPORT QGraphicsTransformPrivate : public QObjectPrivate { public: Q_DECLARE_PUBLIC(QGraphicsTransform) QGraphicsTransformPrivate() : QObjectPrivate(), item(0) {} + ~QGraphicsTransformPrivate(); QGraphicsItem *item;