diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-07 10:52:53 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-07 13:28:29 +0000 |
commit | 35b25bc91784f5a39ee034a99167d5bfee49f74b (patch) | |
tree | f6198a2b9f4456c05f3399d60e95da57499b0036 /src/plugins/platforms/cocoa/qcocoasystemtrayicon.h | |
parent | aea6ff4f57135b0f2f076e86e22cb87c0a7014fe (diff) | |
parent | c2b553784dfbe0ece90f79709639e27e74359a7d (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoasystemtrayicon.h')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoasystemtrayicon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h index d831612c22..6779bda491 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h +++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h @@ -42,8 +42,9 @@ #define QCOCOASYSTEMTRAYICON_P_H #include <QtCore/qglobal.h> +#include <QtGui/qtguiglobal.h> -#ifndef QT_NO_SYSTEMTRAYICON +#if QT_CONFIG(systemtrayicon) #include "QtCore/qstring.h" #include "QtGui/qpa/qplatformsystemtrayicon.h" |