From 73a99f389781f54ed5768af78c7155fbd426451f Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Thu, 5 May 2011 14:19:52 +0200
Subject: compile fixes

---
 src/gui/text/qtextdocument.cpp            | 4 +++-
 src/plugins/platforms/minimal/minimal.pro | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 910a439aec..ee88ab0025 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -58,7 +58,6 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qdir.h>
-#include "qtextcontrol_p.h"
 #include "qfont_p.h"
 #include "private/qtextedit_p.h"
 #include "private/qdataurl_p.h"
@@ -1970,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);
@@ -1980,6 +1981,7 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
     else if (QTextControl *control = qobject_cast<QTextControl *>(parent())) {
         r = control->loadResource(type, name);
     }
+#endif
 #endif
 
     // handle data: URLs
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index c8329387bf..2afd0adf5d 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -1,5 +1,6 @@
 TARGET = qminimal
 include(../../qpluginbase.pri)
+QT += gui-private
 
 DESTDIR = $$QT.gui.plugins/platforms
 
-- 
cgit v1.2.3