mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 02:25:40 +01:00
qt5: fix a build issue with osx and qtdbus
See comment in notificator.cpp for details.
This commit is contained in:
parent
328bdb1cd6
commit
c614bd718b
@ -14,18 +14,18 @@
|
||||
#include <QSystemTrayIcon>
|
||||
#include <QTemporaryFile>
|
||||
#include <QVariant>
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#include "macnotificationhandler.h"
|
||||
|
||||
#include <ApplicationServices/ApplicationServices.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_DBUS
|
||||
#include <stdint.h>
|
||||
|
||||
#include <QtDBus>
|
||||
#endif
|
||||
// Include ApplicationServices.h after QtDbus to avoid redefinition of check().
|
||||
// This affects at least OSX 10.6. See /usr/include/AssertMacros.h for details.
|
||||
// Note: This could also be worked around using:
|
||||
// #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
|
||||
#ifdef Q_OS_MAC
|
||||
#include <ApplicationServices/ApplicationServices.h>
|
||||
#include "macnotificationhandler.h"
|
||||
#endif
|
||||
|
||||
|
||||
// https://wiki.ubuntu.com/NotificationDevelopmentGuidelines recommends at least 128
|
||||
|
Loading…
Reference in New Issue
Block a user