summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwindow_p.h
diff options
context:
space:
mode:
authorCorentin Jabot <corentinjabot@gmail.com>2012-05-17 10:35:32 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-24 20:20:52 +0200
commitce3d1a153aad353ad5e50b935bc1d1494cbbeeee (patch)
tree48ec8fa90c7aa9d3873b578d7f4668177b62e154 /src/gui/kernel/qwindow_p.h
parentdf7a1a28aaab315dc8ed5eb5bac6f4883e646613 (diff)
Implement QWindow::setWindowIcon
Since QIcon has been moved back to QtGui, QWindow::setWindowIcon can use it. That way, the api is exactly the same as in QWidgets and one can deal properly with multi-sized icon. I added a getter so the api is consistent with QWidget (Maybe there should be properties for windowIcon and windowTitle) Change-Id: I2f463dbe39673f41a3201ef8fed27b3fcac2125f Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/gui/kernel/qwindow_p.h')
-rw-r--r--src/gui/kernel/qwindow_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 92eaf90188..d034ad0e4d 100644
--- a/src/gui/kernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
@@ -46,6 +46,7 @@
#include <qpa/qplatformwindow.h>
#include <QtCore/private/qobject_p.h>
+#include <QtGui/QIcon>
QT_BEGIN_HEADER
@@ -113,6 +114,7 @@ public:
bool exposed;
QSurfaceFormat requestedFormat;
QString windowTitle;
+ QIcon windowIcon;
QRect geometry;
Qt::WindowState windowState;
bool resizeEventPending;