diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 421eb9136b6..0d27598fbb2 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -13,6 +13,8 @@ QT_REQUIRE_CONFIG(textedit); +class tst_QTextEdit; + QT_BEGIN_NAMESPACE class QStyleSheet; @@ -283,6 +285,7 @@ private: friend class QTextEditControl; friend class QTextDocument; friend class QWidgetTextControl; + friend class ::tst_QTextEdit; }; Q_DECLARE_OPERATORS_FOR_FLAGS(QTextEdit::AutoFormatting) diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index 70d25f2e57c..36dadf5f213 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -2256,13 +2256,6 @@ void tst_QTextEdit::setDocumentPreservesPalette() } #endif -class PublicTextEdit : public QTextEdit -{ -public: - void publicInsertFromMimeData(const QMimeData *source) - { insertFromMimeData(source); } -}; - void tst_QTextEdit::pasteFromQt3RichText() { QByteArray richtext("
QTextEdit is an ");
@@ -2270,7 +2263,7 @@ void tst_QTextEdit::pasteFromQt3RichText()
QMimeData mimeData;
mimeData.setData("application/x-qrichtext", richtext);
- static_cast