mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 06:52:36 +01:00
Code Issues Projects Releases Wiki Activity

build: Drop unneeded ApplicationServices framework dependency

Browse source
This commit is contained in:
Hennadii Stepanov 2020-11-25 18:18:36 +02:00
parent 5c0aebfcd4
commit 65afe4cb69
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-aux/m4/bitcoin_qt.m4
View file

@ -202,7 +202,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
*darwin*) *darwin*)
BITCOIN_QT_CHECK([ BITCOIN_QT_CHECK([
MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC" MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC"
base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit" base_frameworks="-framework Foundation -framework AppKit"
AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)]) AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)])
]) ])
;; ;;

5
src/qt/notificator.cpp
View file

@ -17,12 +17,7 @@
#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 #ifdef Q_OS_MAC
#include <ApplicationServices/ApplicationServices.h>
#include <qt/macnotificationhandler.h> #include <qt/macnotificationhandler.h>
#endif #endif