File tree Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change 14
14
#include < QSystemTrayIcon>
15
15
#include < QTemporaryFile>
16
16
#include < QVariant>
17
-
18
- #ifdef Q_OS_MAC
19
- #include " macnotificationhandler.h"
20
-
21
- #include < ApplicationServices/ApplicationServices.h>
22
- #endif
23
-
24
17
#ifdef USE_DBUS
25
18
#include < stdint.h>
26
-
27
19
#include < QtDBus>
28
20
#endif
21
+ // Include ApplicationServices.h after QtDbus to avoid redefinition of check().
22
+ // This affects at least OSX 10.6. See /usr/include/AssertMacros.h for details.
23
+ // Note: This could also be worked around using:
24
+ // #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
25
+ #ifdef Q_OS_MAC
26
+ #include < ApplicationServices/ApplicationServices.h>
27
+ #include " macnotificationhandler.h"
28
+ #endif
29
29
30
30
31
31
// https://wiki.ubuntu.com/NotificationDevelopmentGuidelines recommends at least 128
You can’t perform that action at this time.
0 commit comments