From 371d398f70e10408e0eaba7b5f05e638a0048599 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 27 Jun 2011 09:21:59 +0200
Subject: Renamed QLine/TextControl to QWidgetLine/TextControl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renamed them to free up the QTextControl and QLineControl
class names for a new API in QtGui.

Reviewed-by: Jørgen Lind
---
 src/gui/text/qtextdocument.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/text/qtextdocument.cpp')

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 1b1db0d64d..3ca72bf14e 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1978,7 +1978,7 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
     }
 #endif
 #ifndef QT_NO_TEXTCONTROL
-    else if (QTextControl *control = qobject_cast<QTextControl *>(parent())) {
+    else if (QWidgetTextControl *control = qobject_cast<QWidgetTextControl *>(parent())) {
         r = control->loadResource(type, name);
     }
 #endif
-- 
cgit v1.2.3