From b295afb064d728d8f59d0129979c019761624bca Mon Sep 17 00:00:00 2001 From: Marc Mutz 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 Task-number: QTBUG-45582 Reviewed-by: Konstantin Ritt Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- src/gui/text/qstatictext.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/gui/text/qstatictext.cpp') 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 -- cgit v1.2.3 From 79a97be9f31f7092c39186084c9d9d609a9be385 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 4 Jun 2015 12:58:46 +0200 Subject: doc: Remove uses of \mainclass This qdoc command is deprecated. Task-number: QTBUG-46476 Change-Id: Iee36f91bdcf500c2e88022a5f8a9c3accc6048c2 Reviewed-by: Martin Smith --- src/gui/text/qstatictext.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/gui/text/qstatictext.cpp') diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index c3be9b871c..5d31ab9711 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -53,7 +53,6 @@ QStaticTextUserData::~QStaticTextUserData() \ingroup multimedia \ingroup text \ingroup shared - \mainclass QStaticText provides a way to cache layout data for a block of text so that it can be drawn more efficiently than by using QPainter::drawText() in which the layout information is -- cgit v1.2.3