summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qplatformintegration.h
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2015-04-08 13:09:10 +0200
committerAndy Shaw <andy.shaw@digia.com>2015-04-10 10:10:25 +0000
commit34ec0713bb5a2bc12782ab17ceabfead37c4b584 (patch)
tree8fccfe0caa8627c6afff7c5176ce6b3dd17d52e6 /src/gui/kernel/qplatformintegration.h
parentb59521f2a40fab1205e7cec1c99c8c109f98021a (diff)
Add a means to set the application icon where supported
On OS X the application icon can be changed at runtime, so this adds a way to set this via the QPlatformIntegration. [ChangeLog][OS X] QApplication::setWindowIcon now changes the icon for the application in the dock. Task-number: QTBUG-43999 Change-Id: Ice298c0bd52f10f4866f37c6d3f20cf5419b7a1b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'src/gui/kernel/qplatformintegration.h')
-rw-r--r--src/gui/kernel/qplatformintegration.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h
index 34639e6929..473c75a9e0 100644
--- a/src/gui/kernel/qplatformintegration.h
+++ b/src/gui/kernel/qplatformintegration.h
@@ -90,7 +90,8 @@ public:
WindowManagement,
SyncState,
RasterGLSurface,
- AllGLFunctionsQueryable
+ AllGLFunctionsQueryable,
+ ApplicationIcon
};
virtual ~QPlatformIntegration() { }
@@ -169,7 +170,7 @@ public:
#ifndef QT_NO_OPENGL
virtual QOpenGLContext::OpenGLModuleType openGLModuleType();
#endif
-
+ virtual void setApplicationIcon(const QIcon &icon) const;
protected:
void screenAdded(QPlatformScreen *screen, bool isPrimary = false);
void destroyScreen(QPlatformScreen *screen);