AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Qt3 compat leftovers

Browse Source 
Change-Id: I91c3d26125168998d6279bddb0671cfb68eac2f4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2012-10-16 07:20:23 +03:00 committed by The Qt Project
parent 734324c37c
commit dbb2581af5
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/text/qtextengine_p.h
View File

@ -540,24 +540,14 @@ public:
int findItem(int strPos) const;
inline QTextFormatCollection *formats() const {
#ifdef QT_BUILD_COMPAT_LIB
return 0; // Compat should never reference this symbol
#else
if (block.docHandle())
return block.docHandle()->formatCollection();
else if (specialData)
return specialData->formats.data();
return 0;
#endif
return specialData ? specialData->formats.data() : 0;
}
QTextCharFormat format(const QScriptItem *si) const;
inline QAbstractTextDocumentLayout *docLayout() const {
#ifdef QT_BUILD_COMPAT_LIB
return 0; // Compat should never reference this symbol
#else
Q_ASSERT(block.docHandle());
return block.docHandle()->document()->documentLayout();
#endif
}
int formatIndex(const QScriptItem *si) const;