diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-08 16:50:01 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-09 09:34:18 +0200 |
commit | 8cccf0a76b82726ce987690d783a1b912aa6bba5 (patch) | |
tree | 2ad5dc46bd041c62c808d5ad86b049f9a24ccb58 /src/gui/text/qtextimagehandler.cpp | |
parent | ef236456a4857a25b51688e1fd629a80caee1e34 (diff) |
Remove deprecated methods and address some ### Qt 6 comments in gui/text
Change-Id: If1ed58ecbb13df88bdb1d72caccfd01c14d42eac
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/text/qtextimagehandler.cpp')
-rw-r--r-- | src/gui/text/qtextimagehandler.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index 0d87a2135d..cae8304438 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -95,14 +95,6 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format, con } if (pm.isNull()) { -#if 0 - QString context; - // ### Qt5 - QTextBrowser *browser = qobject_cast<QTextBrowser *>(doc->parent()); - if (browser) - context = browser->source().toString(); -#endif - // try direct loading QImage img; if (name.isEmpty() || !img.load(name)) return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-16.png")); @@ -177,15 +169,6 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format, const } if (image.isNull()) { -#if 0 - QString context; - // ### Qt5 - QTextBrowser *browser = qobject_cast<QTextBrowser *>(doc->parent()); - if (browser) - context = browser->source().toString(); -#endif - // try direct loading - if (name.isEmpty() || !image.load(name)) return QImage(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-16.png")); |