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>
This commit is contained in:
parent
2b5fef7c83
commit
b295afb064
src/gui/text
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user