1 files changed, 10 insertions, 22 deletions
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index ee85e55c8d..158ad419a3 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -5,52 +5,40 @@ add_subdirectory(eventdispatchers)
 add_subdirectory(devicediscovery)
 add_subdirectory(fbconvenience)
 add_subdirectory(themes)
-
-if(QT_FEATURE_freetype OR APPLE OR WIN32)
+if(APPLE OR QT_FEATURE_freetype OR WIN32)
     add_subdirectory(fontdatabases)
 endif()
-
-if(QT_FEATURE_evdev OR QT_FEATURE_tslib OR QT_FEATURE_libinput OR QT_FEATURE_integrityhid)
+if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib)
     add_subdirectory(input)
 endif()
-
-if(UNIX AND NOT APPLE_UIKIT OR QT_FEATURE_xcb)
+if(QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT))
     add_subdirectory(services)
 endif()
-
 if(QT_FEATURE_opengl)
     add_subdirectory(platformcompositor)
 endif()
-
 if(QT_FEATURE_egl)
     add_subdirectory(eglconvenience)
 endif()
-
-if(QT_FEATURE_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2)
+if(QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2)
     add_subdirectory(glxconvenience)
 endif()
-
 if(QT_FEATURE_kms)
     add_subdirectory(kmsconvenience)
 endif()
-
 if(QT_FEATURE_accessibility)
     add_subdirectory(accessibility)
-
-    if(QT_FEATURE_accessibility_atspi_bridge)
-        add_subdirectory(linuxaccessibility)
-    endif()
-
-    if(WIN32 AND NOT WINRT)
-        add_subdirectory(windowsuiautomation)
-    endif()
 endif()
-
+if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge)
+    add_subdirectory(linuxaccessibility)
+endif()
+if(QT_FEATURE_accessibility AND WIN32 AND NOT WINRT)
+    add_subdirectory(windowsuiautomation)
+endif()
 if(APPLE)
     add_subdirectory(clipboard)
     add_subdirectory(graphics)
 endif()
-
 if(QT_FEATURE_vulkan)
     add_subdirectory(vkconvenience)
 endif()