From 08c201070817be73c17fa7e4e790ba08e94532c6 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 9 Feb 2023 16:46:55 +0100
Subject: src: Remove remains of qmake conversion from CMakeLists.txt files

Pick-to: 6.5
Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
---
 src/3rdparty/CMakeLists.txt             |  3 ---
 src/3rdparty/harfbuzz-ng/CMakeLists.txt | 17 ++++-------------
 src/3rdparty/libpng/CMakeLists.txt      |  2 --
 src/3rdparty/pcre2/CMakeLists.txt       |  7 -------
 4 files changed, 4 insertions(+), 25 deletions(-)

(limited to 'src/3rdparty')

diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
index a597b47b52..493f6bddff 100644
--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -1,6 +1,3 @@
-# special case skip regeneration
-# The file is maintained manually
-
 if(QT_FEATURE_gui AND QT_FEATURE_png AND NOT QT_FEATURE_system_png)
     add_subdirectory(libpng)
 endif()
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index 709a32f8ba..83566064b3 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from harfbuzz-ng.pro.
-
 #####################################################################
 ## BundledHarfbuzz Generic Library:
 #####################################################################
@@ -7,7 +5,7 @@
 qt_internal_add_3rdparty_library(BundledHarfbuzz
     QMAKE_LIB_NAME harfbuzz
     STATIC
-    SKIP_AUTOMOC # special case
+    SKIP_AUTOMOC
     SOURCES
         hb-dummy.cc
         src/hb.h
@@ -64,8 +62,8 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
         HB_NO_UNICODE_FUNCS
         QT_NO_VERSION_TAGGING
     INCLUDE_DIRECTORIES
-        $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> # special case
-        "${CMAKE_CURRENT_SOURCE_DIR}" # special case
+        $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
+        "${CMAKE_CURRENT_SOURCE_DIR}"
     PUBLIC_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz>
 )
@@ -80,16 +78,9 @@ endif()
 qt_disable_warnings(BundledHarfbuzz)
 qt_set_symbol_visibility_hidden(BundledHarfbuzz)
 
-#### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
-# OTHER_FILES = "$$PWD/src/harfbuzz.cc"
-# SHAPERS = "opentype"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
-# SHAPERS = "coretext"
-
 qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX
     DEFINES
         HAVE_PTHREAD
@@ -102,7 +93,7 @@ qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32
         HB_NO_WIN1256
 )
 
-qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case
+qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE
     SOURCES
         src/hb-ot.h
         src/hb-ot-cff1-std-str.hh
diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt
index 4f8170bd02..8f59719f28 100644
--- a/src/3rdparty/libpng/CMakeLists.txt
+++ b/src/3rdparty/libpng/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from libpng.pro.
-
 #####################################################################
 ## BundledLibpng Generic Library:
 #####################################################################
diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt
index 0b6d608cbb..a688cf608a 100644
--- a/src/3rdparty/pcre2/CMakeLists.txt
+++ b/src/3rdparty/pcre2/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from pcre2.pro.
-
 #####################################################################
 ## BundledPcre2 Generic Library:
 #####################################################################
@@ -77,9 +75,4 @@ qt_internal_extend_target(BundledPcre2 CONDITION WIN32
         PCRE2_STATIC
 )
 
-#### Keys ignored in scope 8:.:.:pcre2.pri:QT_FEATURE_intelcet:
-# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK"
-
-# special case begin
 qt_internal_apply_intel_cet(BundledPcre2 PRIVATE)
-# special case end
-- 
cgit v1.2.3