From f42bd772f8110dba13d209d81d8eed0077772185 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 1 Feb 2014 14:17:51 +0100 Subject: Move setWindowIcon() up to QGuiApplication. [ChangeLog][QtGui][QWindow]QWindow::icon() now defaults to the application icon, which can be set with QGuiApplication::setWindowIcon(). Change-Id: Id1974e5cda81775e515c14b294f67fb99351c6c9 Reviewed-by: Albert Astals Cid Reviewed-by: Friedemann Kleint Reviewed-by: Frederik Gladhorn --- src/gui/kernel/qguiapplication_p.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/gui/kernel/qguiapplication_p.h') diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 22f1cb9aa8..c23232182c 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -187,6 +187,7 @@ public: static QGuiApplicationPrivate *instance() { return self; } + static QIcon *app_icon; static QString *platform_name; static QString *displayName; @@ -282,6 +283,8 @@ public: // hook reimplemented in QApplication to apply the QStyle function on the QIcon virtual QPixmap applyQIconStyleHelper(QIcon::Mode, const QPixmap &basePixmap) const { return basePixmap; } + virtual void notifyWindowIconChanged(); + static QRect applyWindowGeometrySpecification(const QRect &windowGeometry, const QWindow *window); static void setApplicationState(Qt::ApplicationState state); -- cgit v1.2.3