From 101148d0aec36043d63008111662362ae65d5af0 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 8 Oct 2019 11:36:16 +0200
Subject: Regenerate platforminputcontexts plugins

Change-Id: I4175a1249a477c96b7824cf1e82c0822bdf02eb3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/plugins/platforminputcontexts/CMakeLists.txt   | 12 +++++------
 .../compose/.prev_CMakeLists.txt                   | 25 ++++++++++++++++++++++
 .../platforminputcontexts/compose/CMakeLists.txt   |  2 --
 .../platforminputcontexts/ibus/CMakeLists.txt      |  2 +-
 4 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt

(limited to 'src/plugins/platforminputcontexts')

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"
-- 
cgit v1.2.3