Skip to content

Commit c614bd7

Browse files
committed
qt5: fix a build issue with osx and qtdbus
See comment in notificator.cpp for details.
1 parent 328bdb1 commit c614bd7

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/qt/notificator.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
#include <QSystemTrayIcon>
1515
#include <QTemporaryFile>
1616
#include <QVariant>
17-
18-
#ifdef Q_OS_MAC
19-
#include "macnotificationhandler.h"
20-
21-
#include <ApplicationServices/ApplicationServices.h>
22-
#endif
23-
2417
#ifdef USE_DBUS
2518
#include <stdint.h>
26-
2719
#include <QtDBus>
2820
#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
2929

3030

3131
// https://wiki.ubuntu.com/NotificationDevelopmentGuidelines recommends at least 128

0 commit comments

Comments
 (0)