diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-12-20 14:59:09 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-23 11:59:11 +0100 |
| commit | ae8c61db218dbd4329a6b10aa174ed4ef30de7d5 (patch) | |
| tree | f0ab16f9e62763dee63289bcd78ffedda411da0f /src/gui/text/qtextimagehandler.cpp | |
| parent | ef03396072e3959e7d03f55d91c2ffa1faa51d8d (diff) | |
Finish removing Qt3 support
Remove the (-no)-qt3support options from configure, and remove the last
remaining references to Qt3Support, QT3_SUPPORT, and
QEvent::ChildInserted.
The compatibilityChildInsertEvents() tests in tst_QObject and
tst_QWidget have been renamed to childEvents(), which is a more
appropriate name.
Change-Id: Id0b45e9b177efcc8dceee8c9ed8afafedeeace2f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/text/qtextimagehandler.cpp')
| -rw-r--r-- | src/gui/text/qtextimagehandler.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index 138fb1a168..fb93563d10 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -52,9 +52,6 @@ QT_BEGIN_NAMESPACE -// set by the mime source factory in Qt3Compat -QTextImageHandler::ExternalImageLoaderFunction QTextImageHandler::externalLoader = 0; - static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format) { QPixmap pm; @@ -79,9 +76,6 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format) context = browser->source().toString(); #endif QImage img; - if (QTextImageHandler::externalLoader) - img = QTextImageHandler::externalLoader(name, context); - if (img.isNull()) { // try direct loading name = format.name(); // remove qrc:/ prefix again if (name.isEmpty() || !img.load(name)) @@ -157,9 +151,6 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format) if (browser) context = browser->source().toString(); #endif - if (QTextImageHandler::externalLoader) - image = QTextImageHandler::externalLoader(name, context); - if (image.isNull()) { // try direct loading name = format.name(); // remove qrc:/ prefix again if (name.isEmpty() || !image.load(name)) |