From 6c452e2276cf1db8d3a7edb80fabf843d1e3c98a Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 7 Oct 2019 18:28:51 +0200
Subject: Regenerate platformthemes plugins

Change-Id: I1073bcc5467c345a4d6889a6bf5ba2ab484db050
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
---
 src/plugins/platformthemes/CMakeLists.txt          |  6 ++---
 .../platformthemes/gtk3/.prev_CMakeLists.txt       | 30 ++++++++++++++++++++++
 src/plugins/platformthemes/gtk3/CMakeLists.txt     | 18 ++++++++-----
 .../platformthemes/xdgdesktopportal/CMakeLists.txt | 13 +++++++---
 4 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt

diff --git a/src/plugins/platformthemes/CMakeLists.txt b/src/plugins/platformthemes/CMakeLists.txt
index 8550a80652..6aa17c234c 100644
--- a/src/plugins/platformthemes/CMakeLists.txt
+++ b/src/plugins/platformthemes/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Generated from platformthemes.pro.
 
-if (QT_FEATURE_dbus AND QT_FEATURE_regularexpression)
+if(QT_FEATURE_dbus AND QT_FEATURE_mimetype AND QT_FEATURE_regularexpression)
     add_subdirectory(xdgdesktopportal)
 endif()
-
-if (QT_FEATURE_widgets AND QT_FEATURE_gtk3)
+if(QT_FEATURE_gtk3 AND TARGET Qt::Widgets)
     add_subdirectory(gtk3)
 endif()
-
diff --git a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f0e87801ba
--- /dev/null
+++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from gtk3.pro.
+
+#####################################################################
+## qgtk3 Plugin:
+#####################################################################
+
+add_qt_plugin(qgtk3
+    TYPE platformthemes
+    CLASS_NAME QGtk3ThemePlugin
+    SOURCES
+        main.cpp
+        qgtk3dialoghelpers.cpp qgtk3dialoghelpers.h
+        qgtk3menu.cpp qgtk3menu.h
+        qgtk3theme.cpp qgtk3theme.h
+    DEFINES
+        GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::ThemeSupportPrivate
+    PUBLIC_LIBRARIES
+        PkgConfig::GTK3
+        Qt::Core
+        Qt::Gui
+        Qt::ThemeSupport
+)
+
+#### Keys ignored in scope 1:.:.:gtk3.pro:<TRUE>:
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt
index 90af742595..17902f4b95 100644
--- a/src/plugins/platformthemes/gtk3/CMakeLists.txt
+++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from gtk3.pro.
 
-qt_find_package(GTK3)
-qt_find_package(X11)
+qt_find_package(GTK3) # special case
+qt_find_package(X11) # special case
 
 #####################################################################
 ## qgtk3 Plugin:
@@ -21,10 +21,14 @@ add_qt_plugin(qgtk3
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::ThemeSupportPrivate
+        X11::X11 # special case
+    PUBLIC_LIBRARIES
         PkgConfig::GTK3
-        X11::X11
-    # CONFIG = "X11"
-    # PLUGIN_CLASS_NAME = "QGtk3ThemePlugin"
-    # PLUGIN_EXTENDS = "-"
-    # _LOADED = "qt_plugin"
+        Qt::Core
+        Qt::Gui
+        Qt::ThemeSupport
 )
+
+#### Keys ignored in scope 1:.:.:gtk3.pro:<TRUE>:
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
index cdc272ea74..f2ea7a1b7d 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
+++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
@@ -13,10 +13,15 @@ add_qt_plugin(qxdgdesktopportal
         qxdgdesktopportaltheme.cpp qxdgdesktopportaltheme.h
     LIBRARIES
         Qt::CorePrivate
-        Qt::DBus
         Qt::GuiPrivate
         Qt::ThemeSupportPrivate
-    # PLUGIN_CLASS_NAME = "QXdgDesktopPortalThemePlugin"
-    # PLUGIN_EXTENDS = "-"
-    # _LOADED = "qt_plugin"
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+        Qt::Gui
+        Qt::ThemeSupport
 )
+
+#### Keys ignored in scope 1:.:.:xdgdesktopportal.pro:<TRUE>:
+# PLUGIN_EXTENDS = "-"
+# _LOADED = "qt_plugin"
-- 
cgit v1.2.3