1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QAbstractTextDocumentLayoutPrivate: declare dtor out-of-line and export class

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

Export, as QPlainTextDocumentLayoutPrivate (QtWidgets)
inherits it.

Change-Id: I8aee43b43898a72430d8bc1247ea76c7d4e9031d
Reported-by: Volker Krause <volker.krause@kdab.com>
Task-number: QTBUG-45582
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Marc Mutz 2015-05-26 22:16:25 +02:00
parent 60f4d5165a
commit 4ca16e99e7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/text/qabstracttextdocumentlayout.cpp
View File

@ -40,6 +40,10 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QAbstractTextDocumentLayoutPrivate::~QAbstractTextDocumentLayoutPrivate()
{
}
/*! /*!
\class QAbstractTextDocumentLayout \class QAbstractTextDocumentLayout
\reentrant \reentrant

3
src/gui/text/qabstracttextdocumentlayout_p.h
View File

@ -58,13 +58,14 @@ struct QTextObjectHandler
}; };
typedef QHash<int, QTextObjectHandler> HandlerHash; typedef QHash<int, QTextObjectHandler> HandlerHash;
class QAbstractTextDocumentLayoutPrivate : public QObjectPrivate class Q_GUI_EXPORT QAbstractTextDocumentLayoutPrivate : public QObjectPrivate
{ {
public: public:
Q_DECLARE_PUBLIC(QAbstractTextDocumentLayout) Q_DECLARE_PUBLIC(QAbstractTextDocumentLayout)
inline QAbstractTextDocumentLayoutPrivate() inline QAbstractTextDocumentLayoutPrivate()
: paintDevice(0) {} : paintDevice(0) {}
~QAbstractTextDocumentLayoutPrivate();
inline void setDocument(QTextDocument *doc) { inline void setDocument(QTextDocument *doc) {
document = doc; document = doc;