1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Fix references to QIconEngineV2 and QIconEnginePluginV2

Browse Source 
Fix a few lingering doc references to the old classes.

Task-number: QTBUG-59815
Change-Id: Ia6b406485260c943b018422aaeb8e22ca4406e81
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Aaron Linville 2017-04-20 17:37:56 -04:00 committed by Simon Hausmann
parent fad814088c
commit 5995238f29
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/image/qicon.cpp
View File

@ -576,11 +576,11 @@ QFactoryLoader *qt_iconEngineFactoryLoader()
When you retrieve a pixmap using pixmap(QSize, Mode, State), and no When you retrieve a pixmap using pixmap(QSize, Mode, State), and no
pixmap for this given size, mode and state has been added with pixmap for this given size, mode and state has been added with
addFile() or addPixmap(), then QIcon will generate one on the 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 engine scales pixmaps down if required, but never up, and it uses
the current style to calculate a disabled appearance. By using the current style to calculate a disabled appearance. By using
custom icon engines, you can customize every aspect of generated 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 icon engines for different file suffixes, making it possible for
third parties to provide additional icon engines to those included third parties to provide additional icon engines to those included
with Qt. 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 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 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 \sa fromTheme(), QIconEngine
*/ */