File tree Expand file tree Collapse file tree 2 files changed +1
-7
lines changed Expand file tree Collapse file tree 2 files changed +1
-7
lines changed Original file line number Diff line number Diff line change @@ -128,7 +128,6 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
128
128
_BITCOIN_QT_CHECK_STATIC_PLUGINS([ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)] ,[ -lqxcb -lxcb-static] )
129
129
AC_DEFINE ( QT_QPA_PLATFORM_XCB , 1 , [ Define this symbol if the qt platform is xcb] )
130
130
elif test "x$TARGET_OS" = xdarwin; then
131
- AX_CHECK_LINK_FLAG ( [ [ -framework IOKit] ] ,[ QT_LIBS="$QT_LIBS -framework IOKit"] ,[ AC_MSG_ERROR ( could not iokit framework ) ] )
132
131
_BITCOIN_QT_CHECK_STATIC_PLUGINS([ Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)] ,[ -lqcocoa] )
133
132
AC_DEFINE ( QT_QPA_PLATFORM_COCOA , 1 , [ Define this symbol if the qt platform is cocoa] )
134
133
elif test "x$TARGET_OS" = xandroid; then
@@ -202,7 +201,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
202
201
*darwin*)
203
202
BITCOIN_QT_CHECK([
204
203
MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC"
205
- base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit"
204
+ base_frameworks="-framework Foundation -framework AppKit"
206
205
AX_CHECK_LINK_FLAG ( [ [ $base_frameworks] ] ,[ QT_LIBS="$QT_LIBS $base_frameworks"] ,[ AC_MSG_ERROR ( could not find base frameworks ) ] )
207
206
] )
208
207
;;
Original file line number Diff line number Diff line change 17
17
#include < stdint.h>
18
18
#include < QtDBus>
19
19
#endif
20
- // Include ApplicationServices.h after QtDbus to avoid redefinition of check().
21
- // This affects at least OSX 10.6. See /usr/include/AssertMacros.h for details.
22
- // Note: This could also be worked around using:
23
- // #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
24
20
#ifdef Q_OS_MAC
25
- #include < ApplicationServices/ApplicationServices.h>
26
21
#include < qt/macnotificationhandler.h>
27
22
#endif
28
23
You can’t perform that action at this time.
0 commit comments