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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 274a61eb9f..78844960bd 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -155,7 +155,6 @@ struct QTLWExtra { // Regular pointers (keep them together to avoid gaps on 64 bits architectures). QIcon *icon; // widget icon - QPixmap *iconPixmap; QWidgetBackingStoreTracker backingStoreTracker; QBackingStore *backingStore; QPainter *sharedPainter; @@ -421,7 +420,7 @@ public: bool close_helper(CloseMode mode); void setWindowIcon_helper(); - void setWindowIcon_sys(bool forceReset = false); + void setWindowIcon_sys(); void setWindowOpacity_sys(qreal opacity); void adjustQuitOnCloseAttribute(); |