From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 22 Sep 2020 10:16:58 +0200
Subject: CMake: Regenerate projects to use new qt_internal_ API

Modify special case locations to use the new API as well.
Clean up some stale .prev files that are not needed anymore.
Clean up some project files that are not used anymore.

Task-number: QTBUG-86815
Change-Id: I9947da921f98686023c6bb053dfcc101851276b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/winmain/.prev_CMakeLists.txt | 43 ----------------------------------------
 src/winmain/CMakeLists.txt       |  6 +++---
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 src/winmain/.prev_CMakeLists.txt

(limited to 'src/winmain')

diff --git a/src/winmain/.prev_CMakeLists.txt b/src/winmain/.prev_CMakeLists.txt
deleted file mode 100644
index 5b08a0e863..0000000000
--- a/src/winmain/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated from winmain.pro.
-
-#####################################################################
-## qtLibraryTarget$$TARGET$$QT_LIBINFIX Module:
-#####################################################################
-
-add_qt_module(qtLibraryTarget$$TARGET$$QT_LIBINFIX
-    STATIC
-    DEFINES
-        QT_NO_FOREACH
-    PUBLIC_LIBRARIES
-        Qt::Core
-)
-
-#### Keys ignored in scope 1:.:.:winmain.pro:<TRUE>:
-# CONFIG = "static"
-# DESTDIR = "$$QT.core.libs"
-# TEMPLATE = "lib"
-# _LOADED = "qt_installs" "qt_targets" "qt_build_paths" "qt_common"
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 3:.:.:winmain.pro:QT_FEATURE_debug_and_release:
-# CONFIG = "build_all"
-
-#### Keys ignored in scope 4:.:.:winmain.pro:MSVC:
-# QMAKE_CFLAGS_DEBUG = "--Zi" "-Z7"
-
-extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX CONDITION mingw
-    DEFINES
-        QT_NEEDS_QMAIN
-)
-
-extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX
-    SOURCES
-        qtmain_win.cpp
-    LIBRARIES
-        shell32
-)
-
-#### Keys ignored in scope 10:.:.:winmain.pro:else:
-# CONFIG = "-qt"
diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt
index fca2609082..1a74a1e3ae 100644
--- a/src/winmain/CMakeLists.txt
+++ b/src/winmain/CMakeLists.txt
@@ -4,7 +4,7 @@ if (NOT WIN32)
     return()
 endif()
 
-qt_add_module(WinMain
+qt_internal_add_module(WinMain
   STATIC
   NO_SYNC_QT
   NO_MODULE_HEADERS
@@ -22,12 +22,12 @@ endif()
 
 set_property(TARGET WinMain PROPERTY OUTPUT_NAME qtmain)
 
-qt_extend_target(WinMain CONDITION
+qt_internal_extend_target(WinMain CONDITION
     SOURCES qtmain_win.cpp
     LIBRARIES shell32
 )
 
-qt_extend_target(WinMain CONDITION MINGW
+qt_internal_extend_target(WinMain CONDITION MINGW
     DEFINES QT_NEEDS_QMAIN
 )
 # special case end
-- 
cgit v1.2.3