diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-02-12 12:40:32 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-02-12 12:40:32 +0100 |
| commit | 04462a4eb5e931d1e4e4d023dffdab06e1e823a4 (patch) | |
| tree | c6921e632683761640854556779e35316c454a87 /src/plugins/coreplugin/fileiconprovider.cpp | |
| parent | e5d3e04c6085008ed45339ad910e6a7e5503c164 (diff) | |
| download | qt-creator-04462a4eb5e931d1e4e4d023dffdab06e1e823a4.tar.gz | |
Qt4ProjectManager: Fixed static storage of Icons.
suppressing the "~QX11PixmapData(): QPixmap objects must be destroyed
..." warning.
Diffstat (limited to 'src/plugins/coreplugin/fileiconprovider.cpp')
| -rw-r--r-- | src/plugins/coreplugin/fileiconprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index 03bfb56cf4..6e862c7ada 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -163,7 +163,7 @@ QString FileIconProvider::type(const QFileInfo &info) const Creates a pixmap with baseicon at size and overlays overlayIcon over it. See platform note in class documentation about recommended usage. */ -QPixmap FileIconProvider::overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size) const +QPixmap FileIconProvider::overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size) { QPixmap iconPixmap = qApp->style()->standardIcon(baseIcon).pixmap(size); QPainter painter(&iconPixmap); |