2 files changed, 18 insertions, 7 deletions
diff --git a/src/entrypoint/CMakeLists.txt b/src/entrypoint/CMakeLists.txt
index 1dc957d82a..ba8342e41a 100644
--- a/src/entrypoint/CMakeLists.txt
+++ b/src/entrypoint/CMakeLists.txt
@@ -1,6 +1,7 @@
-# special case begin
-# special case skip regeneration
-if (NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+if (NOT (WIN32 OR UIKIT))
     return()
 endif()
 
@@ -106,9 +107,11 @@ if(WIN32)
         target_compile_definitions(EntryPointPrivate INTERFACE QT_NEEDS_QMAIN)
         qt_internal_extend_target(EntryPointImplementation DEFINES QT_NEEDS_QMAIN)
     endif()
+
+    qt_internal_add_sync_header_dependencies(EntryPointImplementation Core)
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if(UIKIT)
     set_target_properties(EntryPointPrivate PROPERTIES
         INTERFACE_LINK_OPTIONS "-Wl,-e,_qt_main_wrapper"
     )
@@ -145,5 +148,3 @@ qt_internal_export_additional_targets_file(
     TARGETS ${export_targets}
     EXPORT_NAME_PREFIX ${export_name_prefix}
     CONFIG_INSTALL_DIR "${config_install_dir}")
-
-# special case end
diff --git a/src/entrypoint/qtentrypoint_win.cpp b/src/entrypoint/qtentrypoint_win.cpp
index 6ecb814948..f0cf46ba3d 100644
--- a/src/entrypoint/qtentrypoint_win.cpp
+++ b/src/entrypoint/qtentrypoint_win.cpp
@@ -36,7 +36,7 @@ static inline char *wideToMulti(unsigned int codePage, const wchar_t *aw)
     return result;
 }
 
-extern "C" int APIENTRY WinMain(HINSTANCE, HINSTANCE, LPSTR /*cmdParamarg*/, int /* cmdShow */)
+static inline int qtEntryPoint()
 {
     int argc = 0;
     wchar_t **argvW = CommandLineToArgvW(GetCommandLineW(), &argc);
@@ -53,3 +53,13 @@ extern "C" int APIENTRY WinMain(HINSTANCE, HINSTANCE, LPSTR /*cmdParamarg*/, int
     delete [] argv;
     return exitCode;
 }
+
+extern "C" int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+    return qtEntryPoint();
+}
+
+extern "C" int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
+{
+    return qtEntryPoint();
+}