test2

Fuzzbawls · Aug 5, 2024 · 60744e7 · 60744e7
1 parent 39f0097
commit 60744e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
@@ -203,7 +203,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
     *darwin*)
      BITCOIN_QT_CHECK([
        MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC"
-       base_frameworks="-framework Foundation -framework AppKit"
+       base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit"
        AX_CHECK_LINK_FLAG([$base_frameworks], [QT_LIBS="$QT_LIBS $base_frameworks"], [AC_MSG_ERROR([could not find base frameworks])])
      ])
     ;;

diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
@@ -204,7 +204,7 @@ target_link_libraries(pivx-qt
         -ldl pthread
         )
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    target_link_libraries(pivx-qt "-framework Cocoa")
+    target_link_libraries(pivx-qt "-framework Cocoa -framework Foundation -framework ApplicationServices -framework AppKit")
 endif()
 if(ZMQ_FOUND)
     target_link_libraries(pivx-qt ZMQ_A ${ZMQ_LIB})

diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
@@ -18,7 +18,12 @@
 #include <QtDBus>
 #include <stdint.h>
 #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