From 5ff43f9c518c089b21907780c00470e741a2cdb8 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 24 Oct 2021 13:46:48 +0400 Subject: [PATCH] Enable HIME with Qt 6 --- external/CMakeLists.txt | 2 +- external/qt/qt_static_plugins/CMakeLists.txt | 2 +- external/qt/qt_static_plugins/qt_static_plugins.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 8b5ce46..4609b1f 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -32,7 +32,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) add_checked_subdirectory(glibmm) endif() add_checked_subdirectory(gsl) -if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION AND NOT DESKTOP_APP_QT6) +if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) add_checked_subdirectory(hime_qt) endif() if (add_hunspell_library) diff --git a/external/qt/qt_static_plugins/CMakeLists.txt b/external/qt/qt_static_plugins/CMakeLists.txt index 5fad7e3..e6668af 100644 --- a/external/qt/qt_static_plugins/CMakeLists.txt +++ b/external/qt/qt_static_plugins/CMakeLists.txt @@ -40,7 +40,7 @@ if (LINUX) endif() endif() - if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION AND NOT DESKTOP_APP_QT6) + if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) target_link_libraries(external_qt_static_plugins PUBLIC desktop-app::external_hime_qt diff --git a/external/qt/qt_static_plugins/qt_static_plugins.cpp b/external/qt/qt_static_plugins/qt_static_plugins.cpp index d10f99b..de7e757 100644 --- a/external/qt/qt_static_plugins/qt_static_plugins.cpp +++ b/external/qt/qt_static_plugins/qt_static_plugins.cpp @@ -63,9 +63,7 @@ Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin) #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) -#endif // Qt < 6.0.0 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION #endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY #endif // Q_OS_UNIX && !Q_OS_MAC