diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-02-28 11:55:26 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-02-28 11:55:42 (GMT) |
| commit | 8190ee79bdaebd8aaa985442c60268c1fcabe719 (patch) | |
| tree | 4f44e85e50bb6120f241338754669db57be7071c /src/gui | |
| parent | f8ca41ab91748a4b847892af642c1a5a1cdeb105 (diff) | |
| parent | 242585ec2671b5c7ac6ef451cc1f5a38ee739df2 (diff) | |
| download | Qt-8190ee79bdaebd8aaa985442c60268c1fcabe719.zip Qt-8190ee79bdaebd8aaa985442c60268c1fcabe719.tar.gz Qt-8190ee79bdaebd8aaa985442c60268c1fcabe719.tar.bz2 | |
Merge remote branch 'earth/master' into master
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qfilesystemmodel.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp index dd27aff..cb8eb6a 100644 --- a/src/gui/dialogs/qfilesystemmodel.cpp +++ b/src/gui/dialogs/qfilesystemmodel.cpp @@ -1458,7 +1458,6 @@ void QFileSystemModel::setIconProvider(QFileIconProvider *provider) { Q_D(QFileSystemModel); d->fileInfoGatherer.setIconProvider(provider); - QApplication::processEvents(); d->root.updateIcon(provider, QString()); } diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index b378b78..4bff5ac 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -1496,7 +1496,7 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset) || !QX11Info::appDefaultColormap(xinfo.screen())) { // unknown DE or non-default visual/colormap, use 1bpp bitmap if (!forceReset || !topData->iconPixmap) - topData->iconPixmap = new QBitmap(qt_toX11Pixmap(icon.pixmap(QSize(64,64)))); + topData->iconPixmap = new QPixmap(qt_toX11Pixmap(QBitmap(icon.pixmap(QSize(64,64))))); pixmap_handle = topData->iconPixmap->handle(); } else { // default depth, use a normal pixmap (even though this |