diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:08:18 +0200 |
| commit | d1ea4813458b383e66ce4df69d1833b8b6a279c4 (patch) | |
| tree | 3bdc16da993e5de56b669e6774fb0748075ddd90 /src/gui/image/qicon.cpp | |
| parent | 1c87d4e1a1d0e1972f6dc85e55ea9be8a42797ba (diff) | |
| parent | 0b1ec78c2d4871afcc89d5b046926b88f0819a7c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/network/access/qnetworkreply.cpp
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
Diffstat (limited to 'src/gui/image/qicon.cpp')
| -rw-r--r-- | src/gui/image/qicon.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 07dcf8b726..fa4b4e01af 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -576,11 +576,11 @@ QFactoryLoader *qt_iconEngineFactoryLoader() When you retrieve a pixmap using pixmap(QSize, Mode, State), and no pixmap for this given size, mode and state has been added with addFile() or addPixmap(), then QIcon will generate one on the - fly. This pixmap generation happens in a QIconEngineV2. The default + fly. This pixmap generation happens in a QIconEngine. The default engine scales pixmaps down if required, but never up, and it uses the current style to calculate a disabled appearance. By using custom icon engines, you can customize every aspect of generated - icons. With QIconEnginePluginV2 it is possible to register different + icons. With QIconEnginePlugin it is possible to register different icon engines for different file suffixes, making it possible for third parties to provide additional icon engines to those included with Qt. @@ -1114,7 +1114,7 @@ QList<QSize> QIcon::availableSizes(Mode mode, State state) const Depending on the way the icon was created, it may have an associated name. This is the case for icons created with fromTheme() or icons - using a QIconEngine which supports the QIconEngineV2::IconNameHook. + using a QIconEngine which supports the QIconEngine::IconNameHook. \sa fromTheme(), QIconEngine */ |