path: root/src/gui/painting/qpaintengine_p.h
diff options
authorMarc Mutz <>2015-06-01 00:22:35 +0200
committerMarc Mutz <>2015-06-03 12:02:55 +0000
commit133e40283155852585b5fc409909a00e920cfcfc (patch)
tree741cb5b83260c70f7fc37ef1a83dac4d4f37c493 /src/gui/painting/qpaintengine_p.h
parentb295afb064d728d8f59d0129979c019761624bca (diff)
De-duplicate vtables, part I: exported private classes
By making the destructor (usually the first non-inline, non-pure, virtual function, and therefore the trigger for most compilers to emit the vtable and type_info structures for the class in that TU) out-of-line, vtables and, more importantly, type_info structures for the class are pinned to a single TU. This prevents false negative dynamic_cast and catch evaluation. In this first batch, we de-inline destructors of exported private classes. Since they are already exported, users of these classes are unaffected by the change, and since it's private API, we don't need to avoid adding code to the out-of-line destructor until Qt 6. Change-Id: I450707877d2cb6a77f79ae1dd355facb98d6c517 Reported-by: Volker Krause <> Task-number: QTBUG-45582 Reviewed-by: Oswald Buddenhagen <> Reviewed-by: Friedemann Kleint <> Reviewed-by: Lars Knoll <> Reviewed-by: Konstantin Ritt <> Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/gui/painting/qpaintengine_p.h')
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
index c58662ede4..918c98997b 100644
--- a/src/gui/painting/qpaintengine_p.h
+++ b/src/gui/painting/qpaintengine_p.h
@@ -60,7 +60,8 @@ class Q_GUI_EXPORT QPaintEnginePrivate
QPaintEnginePrivate() : pdev(0), q_ptr(0), currentClipDevice(0), hasSystemTransform(0),
hasSystemViewport(0) {}
- virtual ~QPaintEnginePrivate() { }
+ virtual ~QPaintEnginePrivate();
QPaintDevice *pdev;
QPaintEngine *q_ptr;
QRegion systemClip;