From e5af534f94f5fb35a66a1ab837d74a57f30f2287 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 12 Oct 2020 16:15:13 +0400 Subject: [PATCH] Get rid of lxqt-qtplugin --- external/CMakeLists.txt | 3 - external/lxqt_qtplugin/CMakeLists.txt | 48 --------------- .../xdgiconloader/CMakeLists.txt | 59 ------------------- 3 files changed, 110 deletions(-) delete mode 100644 external/lxqt_qtplugin/CMakeLists.txt delete mode 100644 external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 2fd24d9..4e86522 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -33,9 +33,6 @@ if (add_hunspell_library) add_checked_subdirectory(hunspell) endif() add_checked_subdirectory(iconv) -if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) - add_checked_subdirectory(lxqt_qtplugin) -endif() add_checked_subdirectory(lz4) if (LINUX) add_checked_subdirectory(materialdecoration) diff --git a/external/lxqt_qtplugin/CMakeLists.txt b/external/lxqt_qtplugin/CMakeLists.txt deleted file mode 100644 index 8796cde..0000000 --- a/external/lxqt_qtplugin/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -# This file is part of Desktop App Toolkit, -# a set of libraries for developing nice desktop applications. -# -# For license and copyright information please follow this link: -# https://github.com/desktop-app/legal/blob/master/LEGAL - -if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) - add_library(external_lxqt_qtplugin INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_lxqt_qtplugin ALIAS external_lxqt_qtplugin) -else() - add_library(external_lxqt_qtplugin STATIC) - add_library(desktop-app::external_lxqt_qtplugin ALIAS external_lxqt_qtplugin) - init_target(external_lxqt_qtplugin "(external)") - - set(lxqt_qtplugin_loc ${third_party_loc}/lxqt-qtplugin) - set(lxqt_qtplugin_src ${lxqt_qtplugin_loc}/src) - - set_target_properties(external_lxqt_qtplugin PROPERTIES AUTOMOC ON) - - nice_target_sources(external_lxqt_qtplugin ${lxqt_qtplugin_src} - PRIVATE - main.cpp - lxqtplatformtheme.cpp - lxqtplatformtheme.h - lxqtsystemtrayicon.cpp - lxqtsystemtrayicon.h - ) - - target_include_directories(external_lxqt_qtplugin - PRIVATE - ${lxqt_qtplugin_src} - ) - - target_compile_definitions(external_lxqt_qtplugin - PRIVATE - QT_STATICPLUGIN - QT_NO_FOREACH - LIB_FM_QT_SONAME="libfm-qt.so.7" - ) - - add_subdirectory(xdgiconloader) - target_link_libraries(external_lxqt_qtplugin - PRIVATE - desktop-app::external_statusnotifieritem - desktop-app::external_xdgiconloader - desktop-app::external_qt - ) -endif() diff --git a/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt b/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt deleted file mode 100644 index 992b3c6..0000000 --- a/external/lxqt_qtplugin/xdgiconloader/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -# This file is part of Desktop App Toolkit, -# a set of libraries for developing nice desktop applications. -# -# For license and copyright information please follow this link: -# https://github.com/desktop-app/legal/blob/master/LEGAL - -if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES) - add_library(external_xdgiconloader INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader) -else() - add_library(external_xdgiconloader STATIC) - add_library(desktop-app::external_xdgiconloader ALIAS external_xdgiconloader) - init_target(external_xdgiconloader "(external)") - - set(libqtxdg_loc ${third_party_loc}/libqtxdg) - set(xdgiconloader_src ${libqtxdg_loc}/src/xdgiconloader) - set(xdgiconloader_includedir "${CMAKE_CURRENT_BINARY_DIR}/xdgiconloader") - - set_target_properties(external_xdgiconloader PROPERTIES AUTOMOC ON) - - nice_target_sources(external_xdgiconloader ${xdgiconloader_src} - PRIVATE - xdgiconloader.cpp - xdgiconloader_p.h - ) - - include(GenerateExportHeader) - generate_export_header(external_xdgiconloader BASE_NAME XdgIconLoader) - - configure_file( - "${CMAKE_CURRENT_BINARY_DIR}/xdgiconloader_export.h" - "${xdgiconloader_includedir}/xdgiconloader_export.h" - COPYONLY - ) - - file( - COPY - ${xdgiconloader_src}/xdgiconloader_p.h - DESTINATION - ${xdgiconloader_includedir}/private/xdgiconloader - ) - - target_include_directories(external_xdgiconloader - PUBLIC - ${xdgiconloader_includedir} - PRIVATE - ${xdgiconloader_src} - ) - - target_compile_definitions(external_xdgiconloader - PRIVATE - QT_NO_KEYWORDS - ) - - target_link_libraries(external_xdgiconloader - PRIVATE - desktop-app::external_qt - ) -endif()