去除说明文档

Author: andrewbytecoder

CMakeLists.txt

@@ -50,10 +50,6 @@ option(BUILD_STATIC_LIBS ON)
 option(BUILD_SHARED_LIBS OFF)
 add_subdirectory(external/Qt-Color-Widgets EXCLUDE_FROM_ALL) 
 
-
-if (APPLE)
-  add_subdirectory(external/QHotkey)
-endif()
 add_subdirectory(src)
 
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") # TODO: Where is this used? Do we need a better

external/QHotkey/CMakeLists.txt

@@ -11,18 +11,7 @@ set(LIBS
 set(SRC_FILES
         qhotkey.cpp)
 
-if(APPLE)
-    set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-    set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-
-    find_library(CARBON_LIBRARY Carbon)
-    mark_as_advanced(CARBON_LIBRARY)
-
-    set(SRC_FILES ${SRC_FILES} qhotkey_mac.cpp)
-    set(LIBS ${LIBS} ${CARBON_LIBRARY})
-elseif(WIN32)
+if(WIN32)
     set(SRC_FILES ${SRC_FILES} qhotkey_win.cpp)
 else()
     find_package(X11 REQUIRED)

src/CMakeLists.txt

@@ -363,20 +363,4 @@ if (WIN32)
     endif ()
 endif ()
 
-# macdeployqt
-if (APPLE)
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-    execute_process(COMMAND brew --prefix qt5 OUTPUT_VARIABLE QTDIR)
-    string(REGEX REPLACE "\n$" "" QTDIR "${QTDIR}")
-    set(MAC_DEPLOY_QT ${QTDIR}/bin/macdeployqt)
-    if (EXISTS ${MAC_DEPLOY_QT})
-        set_source_files_properties(resources/icon.icns PROPERTIES
-                MACOSX_PACKAGE_LOCATION Resources)
-
-        set_target_properties(${target} PROPERTIES
-                MACOSX_BUNDLE TRUE
-                )
-    else ()
-        message("Unable to find executable ${MAC_DEPLOY_QT}.")
-    endif ()
-endif ()
+

src/main.cpp

@@ -76,7 +76,7 @@ QSharedMemory* guiMutexLock()
 
 int main(int argc, char* argv[])
 {
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX)
     wayland_hacks();
 #endif
 
@@ -119,7 +119,7 @@ int main(int argc, char* argv[])
         auto c = Flameshot::instance();
         FlameshotDaemon::start();
 
-#if !(defined(Q_OS_MACOS) || defined(Q_OS_WIN))
+#if !(defined(Q_OS_WIN))
         new FlameshotDBusAdapter(c);
         QDBusConnection dbus = QDBusConnection::sessionBus();
         if (!dbus.isConnected()) {