diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 9949f6bb20f..58f820416c0 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -2534,7 +2534,7 @@ function(qt_add_executable name)
         SOURCES ${arg_SOURCES}
         INCLUDE_DIRECTORIES ${private_includes}
         DEFINES ${arg_DEFINES}
-        LIBRARIES ${arg_LIBRARIES}
+        LIBRARIES ${arg_LIBRARIES} Qt::PlatformCommonInternal
         PUBLIC_LIBRARIES ${extra_libraries} ${arg_PUBLIC_LIBRARIES}
         DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}"
         DBUS_ADAPTOR_FLAGS "${arg_DBUS_ADAPTOR_FLAGS}"
diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index 54e7f4f50e0..2d3b6769cc8 100644
--- a/cmake/QtInternalTargets.cmake
+++ b/cmake/QtInternalTargets.cmake
@@ -97,9 +97,7 @@ if (ANDROID)
     target_link_options(PlatformModuleInternal INTERFACE -fuse-ld=lld)
 endif()
 
-if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
-    target_compile_definitions(PlatformCommonInternal INTERFACE QT_NO_DEBUG)
-endif()
+target_compile_definitions(PlatformCommonInternal INTERFACE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
 
 if(APPLE_UIKIT)
     # Do what mkspecs/features/uikit/default_pre.prf does, aka enable sse2 for