Merge remote branch 'gerrit/master' into refactor

[profile/ivi/qtbase.git] / src / gui / text / qtextdocument.cpp

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 143dc1a..08b6e0b 100644 (file)
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -51,17 +51,15 @@
 #include <qvarlengtharray.h>
 #include <qtextcodec.h>
 #include <qthread.h>
+#include <qcoreapplication.h>
+
 #include "qtexthtmlparser_p.h"
 #include "qpainter.h"
 #include "qprinter.h"
-#include "qtextedit.h"
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qdir.h>
-#include <qapplication.h>
-#include "qtextcontrol_p.h"
 #include "qfont_p.h"
-#include "private/qtextedit_p.h"
 #include "private/qdataurl_p.h"
 
 #include "qtextdocument_p.h"
@@ -1971,6 +1969,8 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
     if (doc) {
         r = doc->loadResource(type, name);
     }
+#if 0
+    // ### Qt5: reenable
 #ifndef QT_NO_TEXTEDIT
     else if (QTextEdit *edit = qobject_cast<QTextEdit *>(parent())) {
         QUrl resolvedName = edit->d_func()->resolveUrl(name);
@@ -1978,10 +1978,11 @@ 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
+#endif
 
     // handle data: URLs
     if (r.isNull() && name.scheme().compare(QLatin1String("data"), Qt::CaseInsensitive) == 0)