kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Re-enable fcitx-qt5 with Qt 6

Browse source
This commit is contained in:
Ilya Fedin 2021-10-27 20:21:43 +04:00 • committed by John Preston
parent faf815fee0
commit 68251bb2f0
5 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
external/CMakeLists.txt vendored
View file

@ -19,9 +19,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
endif() endif()
add_checked_subdirectory(expected) add_checked_subdirectory(expected)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
if (NOT DESKTOP_APP_QT6) add_checked_subdirectory(fcitx_qt5)
add_checked_subdirectory(fcitx_qt5)
endif()
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
add_checked_subdirectory(fcitx5_qt) add_checked_subdirectory(fcitx5_qt)
endif() endif()

7
external/fcitx5_qt/CMakeLists.txt vendored
View file

@ -21,12 +21,7 @@ else()
endif() endif()
set_target_properties(external_fcitx5_qt PROPERTIES AUTOMOC ON) set_target_properties(external_fcitx5_qt PROPERTIES AUTOMOC ON)
set(FCITX5_QT_EXTRA_PLUGIN_NAME "")
if (DESKTOP_APP_QT6)
set(FCITX5_QT_EXTRA_PLUGIN_NAME "\"fcitx\",")
else()
set(FCITX5_QT_EXTRA_PLUGIN_NAME "")
endif()
configure_file("${fcitx5_qt_src}/fcitx5.json.in" "${CMAKE_CURRENT_BINARY_DIR}/fcitx5.json") configure_file("${fcitx5_qt_src}/fcitx5.json.in" "${CMAKE_CURRENT_BINARY_DIR}/fcitx5.json")

22
external/fcitx_qt5/CMakeLists.txt vendored
View file

@ -13,7 +13,12 @@ else()
init_target(external_fcitx_qt5 "(external)") init_target(external_fcitx_qt5 "(external)")
set(fcitx_qt5_loc ${third_party_loc}/fcitx-qt5) set(fcitx_qt5_loc ${third_party_loc}/fcitx-qt5)
set(fcitx_qt5_src ${fcitx_qt5_loc}/platforminputcontext)
if (DESKTOP_APP_QT6)
set(fcitx_qt5_src ${fcitx_qt5_loc}/qt6/platforminputcontext)
else()
set(fcitx_qt5_src ${fcitx_qt5_loc}/qt5/platforminputcontext)
endif()
set_target_properties(external_fcitx_qt5 PROPERTIES AUTOMOC ON) set_target_properties(external_fcitx_qt5 PROPERTIES AUTOMOC ON)
@ -36,10 +41,17 @@ else()
set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml PROPERTIES set_source_files_properties(${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml PROPERTIES
INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h) INCLUDE ${fcitx_qt5_src}/fcitxqtdbustypes.h)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml inputcontextproxy) if (DESKTOP_APP_QT6)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml inputcontext1proxy) qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml inputcontextproxy)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml inputmethodproxy) qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml inputcontext1proxy)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml inputmethod1proxy) qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml inputmethodproxy)
qt6_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml inputmethod1proxy)
else()
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext.xml inputcontextproxy)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputContext1.xml inputcontext1proxy)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod.xml inputmethodproxy)
qt5_add_dbus_interface(fcitx_qt5_adaptors ${fcitx_qt5_src}/org.fcitx.Fcitx.InputMethod1.xml inputmethod1proxy)
endif()
target_sources(external_fcitx_qt5 PRIVATE ${fcitx_qt5_adaptors}) target_sources(external_fcitx_qt5 PRIVATE ${fcitx_qt5_adaptors})

10
external/qt/qt_static_plugins/CMakeLists.txt vendored
View file

@ -25,12 +25,10 @@ if (LINUX)
) )
if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
if (NOT DESKTOP_APP_QT6) target_link_libraries(external_qt_static_plugins
target_link_libraries(external_qt_static_plugins PUBLIC
PUBLIC desktop-app::external_fcitx_qt5
desktop-app::external_fcitx_qt5 )
)
endif()
if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
target_link_libraries(external_qt_static_plugins target_link_libraries(external_qt_static_plugins

2
external/qt/qt_static_plugins/qt_static_plugins.cpp vendored
View file

@ -55,9 +55,7 @@ Q_IMPORT_PLUGIN(QGtk3ThemePlugin)
#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY #if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
Q_IMPORT_PLUGIN(NimfInputContextPlugin) Q_IMPORT_PLUGIN(NimfInputContextPlugin)
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
#endif // Qt < 6.0.0
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin) Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin)
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION