diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-10 17:05:10 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-23 09:58:57 +0200 |
| commit | 11bad6109606794091adc3b8a14070ac09707f45 (patch) | |
| tree | 603d07bada752a534a8549c6d008b9b8a4aa832a /src/gui/text/qtextdocument.cpp | |
| parent | a618c260ed0d1de711a5bc20337f9b8c3835c407 (diff) | |
Deprecate QVariant::Type
It's been obsolete for a long time already. Make sure
the compiler now warns about it and remove all remaining
uses in qtbase.
Change-Id: I0ff80311184dba52d2ba5f4e2fabe0d47fdc59d7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index ff142794f6..0c5872a2f2 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -2052,10 +2052,10 @@ void QTextDocument::print(QPagedPaintDevice *printer) const \value UnknownResource No resource is loaded, or the resource type is not known. \value HtmlResource The resource contains HTML. \value ImageResource The resource contains image data. - Currently supported data types are QVariant::Pixmap and - QVariant::Image. If the corresponding variant is of type - QVariant::ByteArray then Qt attempts to load the image using - QImage::loadFromData. QVariant::Icon is currently not supported. + Currently supported data types are QMetaType::QPixmap and + QMetaType::QImage. If the corresponding variant is of type + QMetaType::QByteArray then Qt attempts to load the image using + QImage::loadFromData. QMetaType::QIcon is currently not supported. The icon needs to be converted to one of the supported types first, for example using QIcon::pixmap. \value StyleSheetResource The resource contains CSS. |