From b295afb064d728d8f59d0129979c019761624bca Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Tue, 26 May 2015 22:16:25 +0200
Subject: QStaticTextUserData: declare dtor out-of-line and export class

De-duplicates vtables and enables RTTI on this class
hierarchy.

Export, as QOpenGLStaticTextUserData (QtOpenGL) inherits it.

Change-Id: I0662870538c35f23baf6bde4594ec8b9055efae7
Reported-by: Volker Krause <volker.krause@kdab.com>
Task-number: QTBUG-45582
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/gui/text/qstatictext.cpp | 4 ++++
 src/gui/text/qstatictext_p.h | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index fc95a859e7..c3be9b871c 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -39,6 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
+QStaticTextUserData::~QStaticTextUserData()
+{
+}
+
 /*!
     \class QStaticText
     \brief The QStaticText class enables optimized drawing of text when the text and its layout
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index 088e49e2fc..49ca24d51c 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -52,7 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class QStaticTextUserData
+// ### Qt 6: Unexport again, if QOpenGLStaticTextUserData (the one from QtOpenGL) is gone by then
+class Q_GUI_EXPORT QStaticTextUserData
 {
 public:
     enum Type {
@@ -61,7 +62,7 @@ public:
     };
 
     QStaticTextUserData(Type t) : ref(0), type(t) {}
-    virtual ~QStaticTextUserData() {}
+    virtual ~QStaticTextUserData();
 
     QAtomicInt ref;
     Type type;
-- 
cgit v1.2.3