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.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/gui/kernel/qguiapplication.h') diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 0089d48fa6..6d9a4b2376 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -73,6 +73,7 @@ class QStyleHints; class Q_GUI_EXPORT QGuiApplication : public QCoreApplication { Q_OBJECT + Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon) Q_PROPERTY(QString applicationDisplayName READ applicationDisplayName WRITE setApplicationDisplayName) Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection) Q_PROPERTY(QString platformName READ platformName STORED false) @@ -93,6 +94,9 @@ public: static QWindowList topLevelWindows(); static QWindow *topLevelAt(const QPoint &pos); + static void setWindowIcon(const QIcon &icon); + static QIcon windowIcon(); + static QString platformName(); static QWindow *modalWindow(); -- cgit v1.2.3