diff options
| author | David Faure <david.faure@kdab.com> | 2014-02-01 14:17:51 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 20:12:17 +0100 |
| commit | f42bd772f8110dba13d209d81d8eed0077772185 (patch) | |
| tree | 2c5582727b3684e71887a2be594c2beda7f0c7db /src/gui/kernel/qguiapplication_p.h | |
| parent | bf82245bafad25403aeb7129ebe1fc419c6f4ad9 (diff) | |
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 <albert.astals@canonical.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/gui/kernel/qguiapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
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); |