1 files changed, 18 insertions, 17 deletions
diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt
index 57c3952e4c..69071a22c2 100644
--- a/src/plugins/platforms/CMakeLists.txt
+++ b/src/plugins/platforms/CMakeLists.txt
@@ -1,34 +1,32 @@
-# Generated from platforms.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
-if(ANDROID AND NOT ANDROID_EMBEDDED)
+if(ANDROID)
     add_subdirectory(android)
 endif()
-if(NOT ANDROID)
+if(NOT ANDROID AND NOT WASM)
     add_subdirectory(minimal)
 endif()
-if(QT_FEATURE_freetype AND NOT ANDROID)
+if(QT_FEATURE_freetype AND NOT ANDROID AND NOT WASM)
     add_subdirectory(offscreen)
 endif()
 if(QT_FEATURE_xcb)
     add_subdirectory(xcb)
 endif()
-if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
+if(UIKIT AND NOT WATCHOS)
     add_subdirectory(ios)
 endif()
-if(APPLE_OSX)
+if(MACOS)
     add_subdirectory(cocoa)
 endif()
-if(WIN32 AND NOT WINRT) # special case TODO fix direct3d9 test
+if(WIN32)
     add_subdirectory(windows)
 endif()
-if(QT_FEATURE_direct3d11 AND WINRT)
-    # add_subdirectory(winrt) # special case TODO
-endif()
-if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_direct3d11_1 AND QT_FEATURE_directwrite1)
-    # add_subdirectory(direct2d) # special case TODO
+if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_directwrite)
+    add_subdirectory(direct2d)
 endif()
 if(QNX)
-    # add_subdirectory(qnx) # special case TODO
+    add_subdirectory(qnx)
 endif()
 if(QT_FEATURE_eglfs)
     add_subdirectory(eglfs)
@@ -44,14 +42,17 @@ if(QT_FEATURE_vnc AND TARGET Qt::Network)
     add_subdirectory(vnc)
 endif()
 if(FREEBSD)
-    # add_subdirectory(bsdfb) # special case TODO
+    # add_subdirectory(bsdfb) # TODO: QTBUG-112768
 endif()
 if(HAIKU)
-    # add_subdirectory(haiku) # special case TODO
+    # add_subdirectory(haiku) # TODO: QTBUG-112768
 endif()
 if(WASM)
-    # add_subdirectory(wasm) # special case TODO
+     add_subdirectory(wasm)
 endif()
 if(QT_FEATURE_integrityfb)
-    # add_subdirectory(integrity) # special case TODO
+    # add_subdirectory(integrity) # TODO: QTBUG-112768
+endif()
+if(QT_FEATURE_vkkhrdisplay)
+    add_subdirectory(vkkhrdisplay)
 endif()