diff options
| author | Corentin Jabot <corentinjabot@gmail.com> | 2012-05-26 02:12:06 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-02 01:14:14 +0200 |
| commit | 074224eca0088a261418b53a1cc64a5053f89807 (patch) | |
| tree | a92acfe75544b9897bfac3605e28c280e14b97be /src/widgets/kernel/qwidget.cpp | |
| parent | 42a6fb40902be0a96a070197f9d973b1ae0231af (diff) | |
Implement QWidgetPrivate::setWindowIcon_sys()
* The widgets icon are correctly set, through the QPA plugins
* Removing QTLWExtra::iconPixmap that was only used in some platforms
in Qt 4.7, so if that wariable is still needed somewhere, it sould be
declared in the concerned QPA plugins
Change-Id: I85f50726cce3578b66c09c327767111f09935075
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 1852c5f648..454ffd5eb7 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1336,7 +1336,8 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow) // need to force the resting of the icon after changing parents if (testAttribute(Qt::WA_SetWindowIcon)) - d->setWindowIcon_sys(true); + d->setWindowIcon_sys(); + if (isWindow() && !d->topData()->iconText.isEmpty()) d->setWindowIconText_helper(d->topData()->iconText); if (isWindow() && !d->topData()->caption.isEmpty()) @@ -1520,7 +1521,6 @@ void QWidgetPrivate::createTLExtra() if (!extra->topextra) { QTLWExtra* x = extra->topextra = new QTLWExtra; x->icon = 0; - x->iconPixmap = 0; x->backingStore = 0; x->sharedPainter = 0; x->incw = x->inch = 0; @@ -1604,7 +1604,6 @@ void QWidgetPrivate::deleteExtra() deleteTLSysExtra(); extra->topextra->backingStoreTracker.destroy(); delete extra->topextra->icon; - delete extra->topextra->iconPixmap; delete extra->topextra->backingStore; delete extra->topextra; } @@ -5660,9 +5659,6 @@ void QWidget::setWindowIcon(const QIcon &icon) d->extra->topextra->icon = new QIcon(); *d->extra->topextra->icon = icon; - delete d->extra->topextra->iconPixmap; - d->extra->topextra->iconPixmap = 0; - d->setWindowIcon_sys(); d->setWindowIcon_helper(); } |