whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regenerate platforminputcontexts plugins 

Change-Id: I4175a1249a477c96b7824cf1e82c0822bdf02eb3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
bb10
Alexandru Croitor 2019-10-08 11:36:16 +02:00
parent 152c593423
commit 101148d0ae
4 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforminputcontexts/CMakeLists.txt
View File

@ -1,10 +1,8 @@
# Generated from platforminputcontexts.pro.
if(QT_FEATURE_dbus AND (NOT APPLE_OSX) AND (NOT WIN32) AND (NOT EMSCRIPTEN))
add_subdirectory(ibus)
endif()
if(QT_FEATURE_xcb)
if(QT_FEATURE_xkbcommon)
add_subdirectory(compose)
endif()
if(QT_FEATURE_xkbcommon AND TARGET Qt::DBus AND UNIX AND NOT APPLE_OSX)
add_subdirectory(ibus)
endif()

25
src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,25 @@
# Generated from compose.pro.
#####################################################################
## composeplatforminputcontextplugin Plugin:
#####################################################################
add_qt_plugin(composeplatforminputcontextplugin
TYPE platforminputcontexts
CLASS_NAME QComposePlatformInputContextPlugin
SOURCES
qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h
qcomposeplatforminputcontextmain.cpp
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
XKB::XKB
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
)
#### Keys ignored in scope 1:.:.:compose.pro:<TRUE>:
# OTHER_FILES = "$$PWD/compose.json"
# PLUGIN_EXTENDS = "-"
# _LOADED = "qt_plugin"

2
src/plugins/platforminputcontexts/compose/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#####################################################################
qt_find_package(XKB) # special case
pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case
add_qt_plugin(composeplatforminputcontextplugin
@ -25,6 +24,5 @@ add_qt_plugin(composeplatforminputcontextplugin
#### Keys ignored in scope 1:.:.:compose.pro:<TRUE>:
# OTHER_FILES = "$$PWD/compose.json"
# PLUGIN_CLASS_NAME = "QComposePlatformInputContextPlugin"
# PLUGIN_EXTENDS = "-"
# _LOADED = "qt_plugin"

2
src/plugins/platforminputcontexts/ibus/CMakeLists.txt
View File

@ -18,6 +18,7 @@ add_qt_plugin(ibusplatforminputcontextplugin
Qt::GuiPrivate
Qt::XkbCommonSupportPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
Qt::Gui
Qt::XkbCommonSupport
@ -25,6 +26,5 @@ add_qt_plugin(ibusplatforminputcontextplugin
#### Keys ignored in scope 1:.:.:ibus.pro:<TRUE>:
# OTHER_FILES = "$$PWD/ibus.json"
# PLUGIN_CLASS_NAME = "QIbusPlatformInputContextPlugin"
# PLUGIN_EXTENDS = "-"
# _LOADED = "qt_plugin"