diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2013-12-18 20:29:24 -0500 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-01-10 16:30:33 -0500 |
| commit | c614bd718b91ec5560a14ca85bffa5e9a3e78b84 (patch) | |
| tree | 56e2a4ce521369c1097d36ae3c15f656e96f3bf0 /src/qt/notificator.cpp | |
| parent | 328bdb1cd63a46af3bcc1431ffa24dd8fe3125e7 (diff) | |
| download | bitcoin-c614bd718b91ec5560a14ca85bffa5e9a3e78b84.tar.xz | |
qt5: fix a build issue with osx and qtdbus
See comment in notificator.cpp for details.
Diffstat (limited to 'src/qt/notificator.cpp')
| -rw-r--r-- | src/qt/notificator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 1cef397d12..38a029dbe5 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -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 |