diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-08 11:36:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-08 16:28:19 +0000 |
| commit | 101148d0aec36043d63008111662362ae65d5af0 (patch) | |
| tree | eae4e0eecf14fe69341d48dd962969cd6e650aaa /src/plugins/platforminputcontexts | |
| parent | 152c593423ee42c9197bf2b6f7e9e44e9fd6111b (diff) | |
Regenerate platforminputcontexts plugins
Change-Id: I4175a1249a477c96b7824cf1e82c0822bdf02eb3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins/platforminputcontexts')
4 files changed, 31 insertions, 10 deletions
diff --git a/src/plugins/platforminputcontexts/CMakeLists.txt b/src/plugins/platforminputcontexts/CMakeLists.txt index a6f43b7e5a..155f5161f2 100644 --- a/src/plugins/platforminputcontexts/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/CMakeLists.txt @@ -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() diff --git a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d68ff2fcff --- /dev/null +++ b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt @@ -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" diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt index 0f3bb139b6..406e535226 100644 --- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt @@ -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" diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt index e06aad10e2..cb9338426a 100644 --- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt @@ -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" |