From 0584424d5ccc7d1e3b9aa60da46ca1db244ce470 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 27 Jun 2011 14:21:13 +0200
Subject: [PATCH] Fix compilation

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

Change-Id: I4820be826f1305540d4d83335b20b66a1c839fb2
---
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp   | 1 -
 tests/auto/qplaintextedit/tst_qplaintextedit.cpp | 4 ++--
 tests/auto/qtextedit/tst_qtextedit.cpp           | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index d8b2da66c3..4fd23bfa70 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -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>
diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
index 0802f51752..8a423dc933 100644
--- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
@@ -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());
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 65158d3d7a..67c610b21a 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -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();