qt5: fix a build issue with osx and qtdbus

See comment in notificator.cpp for details.
This commit is contained in:
Cory Fields 2013-12-18 20:29:24 -05:00
parent 328bdb1cd6
commit c614bd718b

View File

@ -14,18 +14,18 @@
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QVariant> #include <QVariant>
#ifdef Q_OS_MAC
#include "macnotificationhandler.h"
#include <ApplicationServices/ApplicationServices.h>
#endif
#ifdef USE_DBUS #ifdef USE_DBUS
#include <stdint.h> #include <stdint.h>
#include <QtDBus> #include <QtDBus>
#endif #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 // https://wiki.ubuntu.com/NotificationDevelopmentGuidelines recommends at least 128