diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index a86b958c105..eb5e81c3529 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -3,6 +3,8 @@
 add_subdirectory(themes)
 add_subdirectory(edid)
 add_subdirectory(eventdispatchers)
+add_subdirectory(devicediscovery)
+add_subdirectory(fbconvenience)
 
 if(QT_FEATURE_freetype OR APPLE OR WIN32)
     add_subdirectory(fontdatabases)
diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt
new file mode 100644
index 00000000000..3d419d084fa
--- /dev/null
+++ b/src/platformsupport/devicediscovery/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from devicediscovery.pro.
+
+#####################################################################
+## DeviceDiscoverySupport Module:
+#####################################################################
+
+add_qt_module(DeviceDiscoverySupport
+    STATIC
+    SOURCES
+        qdevicediscovery_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h
+    LIBRARIES
+        libudev
+)
+
+extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_static.cpp qdevicediscovery_static_p.h
+)
+
+extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_dummy.cpp qdevicediscovery_dummy_p.h
+)
diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt
new file mode 100644
index 00000000000..ddb6dc99e30
--- /dev/null
+++ b/src/platformsupport/fbconvenience/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from fbconvenience.pro.
+
+#####################################################################
+## FbSupport Module:
+#####################################################################
+
+add_qt_module(FbSupport
+    STATIC
+    SOURCES
+        qfbbackingstore.cpp qfbbackingstore_p.h
+        qfbcursor.cpp qfbcursor_p.h
+        qfbscreen.cpp qfbscreen_p.h
+        qfbvthandler.cpp qfbvthandler_p.h
+        qfbwindow.cpp qfbwindow_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)