summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-05 14:19:52 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-05 14:19:52 +0200
commit73a99f389781f54ed5768af78c7155fbd426451f (patch)
tree658c8782889e2f3685b36fd81d513ce45f32db04 /src
parent2bcd79e213f9637b4c12e7c82a74e621ec0f3ca3 (diff)
compile fixes
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qtextdocument.cpp4
-rw-r--r--src/plugins/platforms/minimal/minimal.pro1
2 files changed, 4 insertions, 1 deletions
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);
@@ -1981,6 +1982,7 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
r = control->loadResource(type, name);
}
#endif
+#endif
// handle data: URLs
if (r.isNull() && name.scheme().compare(QLatin1String("data"), Qt::CaseInsensitive) == 0)
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