diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:44:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:58:30 +0200 |
| commit | c2b553784dfbe0ece90f79709639e27e74359a7d (patch) | |
| tree | 04b0c74c7417a5f1b628d0b18a07f9dd8be1df60 /src/plugins/platforms/cocoa/qcocoasystemtrayicon.h | |
| parent | 0b373c2e36a68aedf3731fcb3cd84fd010c2d67c (diff) | |
| parent | 8ea0a82a6a771dd76df2d51c6ef3ed966a5b9b45 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qvariant.h
src/corelib/tools/qlist.h
Done-With: Milian Wolff <milian.wolff@kdab.com>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I6803f7239aa137a51a7467fab7cc7a01302a848d
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" |