diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 03bfd21..2eee673 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -38,9 +38,6 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) add_checked_subdirectory(kwayland) endif() add_checked_subdirectory(lz4) -if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) - add_checked_subdirectory(materialdecoration) -endif() add_checked_subdirectory(minizip) if (LINUX) add_checked_subdirectory(nimf_qt5) diff --git a/external/materialdecoration/CMakeLists.txt b/external/materialdecoration/CMakeLists.txt deleted file mode 100644 index 1a3bd9b..0000000 --- a/external/materialdecoration/CMakeLists.txt +++ /dev/null @@ -1,56 +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) - add_library(external_materialdecoration INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_materialdecoration ALIAS external_materialdecoration) -else() - add_library(external_materialdecoration STATIC) - add_library(desktop-app::external_materialdecoration ALIAS external_materialdecoration) - init_target(external_materialdecoration "(external)") - - set(materialdecoration_loc ${third_party_loc}/materialdecoration) - set(materialdecoration_src ${materialdecoration_loc}/src/plugins/decorations/material) - - set_target_properties(external_materialdecoration PROPERTIES AUTOMOC ON) - - nice_target_sources(external_materialdecoration ${materialdecoration_src} - PRIVATE - materialdecoration.cpp - materialdecoration.h - plugin.cpp - ) - - target_include_directories(external_materialdecoration - PRIVATE - ${materialdecoration_src} - ) - - target_compile_definitions(external_materialdecoration - PRIVATE - QT_STATICPLUGIN - ) - - target_link_libraries(external_materialdecoration - PRIVATE - desktop-app::external_qt - ) - - if (DESKTOP_APP_USE_PACKAGED) - find_package(PkgConfig REQUIRED) - pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client) - - target_link_libraries(external_materialdecoration - PRIVATE - PkgConfig::WAYLAND_CLIENT - ) - else() - target_link_static_libraries(external_materialdecoration - PRIVATE - wayland-client - ) - endif() -endif() diff --git a/external/qt/qt_static_plugins/CMakeLists.txt b/external/qt/qt_static_plugins/CMakeLists.txt index 09c96b6..ffd741b 100644 --- a/external/qt/qt_static_plugins/CMakeLists.txt +++ b/external/qt/qt_static_plugins/CMakeLists.txt @@ -33,11 +33,4 @@ if (LINUX) desktop-app::external_hime_qt ) endif() - - if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) - target_link_libraries(external_qt_static_plugins - PUBLIC - desktop-app::external_materialdecoration - ) - endif() endif() diff --git a/external/qt/qt_static_plugins/qt_static_plugins.cpp b/external/qt/qt_static_plugins/qt_static_plugins.cpp index 587a66a..751f53e 100644 --- a/external/qt/qt_static_plugins/qt_static_plugins.cpp +++ b/external/qt/qt_static_plugins/qt_static_plugins.cpp @@ -52,9 +52,6 @@ Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin) Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION -#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION -Q_IMPORT_PLUGIN(QWaylandMaterialDecorationPlugin) -#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION #endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY #if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES