whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation 

Fix compilation in the autotests due to the renaming
of QTextControl to QWidgetTextControl.

Change-Id: I4820be826f1305540d4d83335b20b66a1c839fb2
bb10
Lars Knoll 2011-06-27 14:21:13 +02:00
parent 18a3f6169b
commit 0584424d5c
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
View File

@ -42,7 +42,6 @@
#include <QtTest/QtTest>
#include <private/qtextcontrol_p.h>
#include <private/qgraphicsitem_p.h>
#include <private/qgraphicsview_p.h>
#include <private/qgraphicsscene_p.h>

4
tests/auto/qplaintextedit/tst_qplaintextedit.cpp
View File

@ -50,7 +50,7 @@
#include <qapplication.h>
#include <qclipboard.h>
#include <qtextbrowser.h>
#include <private/qtextcontrol_p.h>
#include <private/qwidgettextcontrol_p.h>
#include <qscrollbar.h>
#include <qtextobject.h>
@ -1136,7 +1136,7 @@ void tst_QPlainTextEdit::mimeDataReimplementations()
QCOMPARE(ed.insertCallCount, 0);
#ifdef QT_BUILD_INTERNAL
QTextControl *control = qFindChild<QTextControl *>(&ed);
QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(&ed);
QVERIFY(control);
control->canInsertFromMimeData(QApplication::clipboard()->mimeData());

6
tests/auto/qtextedit/tst_qtextedit.cpp
View File

@ -49,7 +49,7 @@
#include <qapplication.h>
#include <qclipboard.h>
#include <qtextbrowser.h>
#include <private/qtextcontrol_p.h>
#include <private/qwidgettextcontrol_p.h>
#include <qscrollbar.h>
#include <qtextobject.h>
#include <qtexttable.h>
@ -1482,7 +1482,7 @@ void tst_QTextEdit::mimeDataReimplementations()
QCOMPARE(ed.insertCallCount, 0);
#ifdef QT_BUILD_INTERNAL
QTextControl *control = qFindChild<QTextControl *>(&ed);
QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(&ed);
QVERIFY(control);
control->canInsertFromMimeData(QApplication::clipboard()->mimeData());
@ -2093,7 +2093,7 @@ void tst_QTextEdit::cursorRect()
void tst_QTextEdit::setDocumentPreservesPalette()
{
#ifdef QT_BUILD_INTERNAL
QTextControl *control = qFindChild<QTextControl *>(ed);
QWidgetTextControl *control = qFindChild<QWidgetTextControl *>(ed);
QVERIFY(control);
QPalette defaultPal = ed->palette();