diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bf1930..dcb0992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,7 @@ if (LINUX AND Qt5WaylandClient_FOUND) add_subdirectory(linux_wayland_helper) endif() -if (LINUX - AND NOT DESKTOP_APP_USE_PACKAGED - AND NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) +if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED) add_subdirectory(linux_gtk_helper) endif() if (DESKTOP_APP_USE_ALLOCATION_TRACER) diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt index 8391f65..711dc71 100644 --- a/external/qt/CMakeLists.txt +++ b/external/qt/CMakeLists.txt @@ -212,17 +212,11 @@ else() plugins/wayland-decoration-client/${qt_lib_prefix}bradient ) endif() - set(qt_libs_gtk_plugins) - if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) - set(qt_libs_gtk_plugins - plugins/platformthemes/${qt_lib_prefix}qgtk3 - ) - endif() set(qt_libs plugins/platforminputcontexts/${qt_lib_prefix}composeplatforminputcontextplugin ${qt_libs_dbus_plugins} ${qt_libs_waylandclient_plugins} - ${qt_libs_gtk_plugins} + plugins/platformthemes/${qt_lib_prefix}qgtk3 plugins/platforms/${qt_lib_prefix}qxcb plugins/xcbglintegrations/${qt_lib_prefix}qxcb-egl-integration plugins/xcbglintegrations/${qt_lib_prefix}qxcb-glx-integration @@ -290,13 +284,11 @@ else() $ ) endif() - if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) - target_link_libraries(external_qt - INTERFACE - desktop-app::linux_gtk_helper - $ - ) - endif() + target_link_libraries(external_qt + INTERFACE + desktop-app::linux_gtk_helper + $ + ) target_link_libraries(external_qt INTERFACE fontconfig diff --git a/external/qt/qt_static_plugins/qt_static_plugins.cpp b/external/qt/qt_static_plugins/qt_static_plugins.cpp index 71b4bad..341cc99 100644 --- a/external/qt/qt_static_plugins/qt_static_plugins.cpp +++ b/external/qt/qt_static_plugins/qt_static_plugins.cpp @@ -39,9 +39,7 @@ Q_IMPORT_PLUGIN(QWaylandEglClientBufferPlugin) Q_IMPORT_PLUGIN(QWaylandWlShellIntegrationPlugin) Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin) #endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION -#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION Q_IMPORT_PLUGIN(QGtk3ThemePlugin) -#endif // !DESKTOP_APP_DISABLE_GTK_INTEGRATION #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_UNIX #endif // !DESKTOP_APP_USE_PACKAGED diff --git a/options.cmake b/options.cmake index 10d8c89..91d8897 100644 --- a/options.cmake +++ b/options.cmake @@ -42,13 +42,6 @@ if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) ) endif() -if (DESKTOP_APP_DISABLE_GTK_INTEGRATION) - target_compile_definitions(common_options - INTERFACE - DESKTOP_APP_DISABLE_GTK_INTEGRATION - ) -endif() - if (DESKTOP_APP_USE_PACKAGED) target_compile_definitions(common_options INTERFACE diff --git a/variables.cmake b/variables.cmake index 554ef40..5ff5748 100644 --- a/variables.cmake +++ b/variables.cmake @@ -21,7 +21,6 @@ option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) option(DESKTOP_APP_DISABLE_DBUS_INTEGRATION "Disable all code for D-Bus integration (Linux only)." OFF) option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration (Linux only)." OFF) option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration (Linux only)." OFF) -option(DESKTOP_APP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF) option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer (Linux only)." OFF) option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target}) option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)