summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-09 13:59:39 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-10 15:11:25 +0100
commit16a75d327ac995f5717cdd246c0c017916e1206a (patch)
treee75d8ce5d99e8691c72bc0db9494995551f107fd /src
parentb3572c6416a5a383b63b9f2adce83ce3dc383db3 (diff)
downloadqtsvg-16a75d327ac995f5717cdd246c0c017916e1206a.tar.gz
Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5 Change-Id: I8720313b2bc9cf9312a1f1a3d40171e1b2c8a257 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/plugins/CMakeLists.txt2
-rw-r--r--src/plugins/iconengines/CMakeLists.txt2
-rw-r--r--src/plugins/iconengines/svgiconengine/CMakeLists.txt6
-rw-r--r--src/plugins/imageformats/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/svg/CMakeLists.txt5
-rw-r--r--src/svg/CMakeLists.txt8
-rw-r--r--src/svgwidgets/CMakeLists.txt2
8 files changed, 0 insertions, 29 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0bed3a6..a139a05 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from src.pro.
-
if(TARGET Qt::Gui)
add_subdirectory(svg)
add_subdirectory(plugins)
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 8bf3900..e71099a 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from plugins.pro.
-
add_subdirectory(iconengines)
if(QT_FEATURE_imageformatplugin)
add_subdirectory(imageformats)
diff --git a/src/plugins/iconengines/CMakeLists.txt b/src/plugins/iconengines/CMakeLists.txt
index c54ad9a..bb8d2d3 100644
--- a/src/plugins/iconengines/CMakeLists.txt
+++ b/src/plugins/iconengines/CMakeLists.txt
@@ -1,6 +1,4 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from iconengines.pro.
-
add_subdirectory(svgiconengine)
diff --git a/src/plugins/iconengines/svgiconengine/CMakeLists.txt b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
index aeb04ab..7e4c4a6 100644
--- a/src/plugins/iconengines/svgiconengine/CMakeLists.txt
+++ b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from svgiconengine.pro.
-
#####################################################################
## QSvgIconPlugin Plugin:
#####################################################################
@@ -20,7 +18,3 @@ qt_internal_add_plugin(QSvgIconPlugin
Qt::GuiPrivate
Qt::Svg
)
-
-#### Keys ignored in scope 1:.:.:svgiconengine.pro:<TRUE>:
-# OTHER_FILES = "qsvgiconengine.json" "qsvgiconengine-nocompress.json"
-# PLUGIN_EXTENDS = "svg"
diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt
index c8724b7..858c5c1 100644
--- a/src/plugins/imageformats/CMakeLists.txt
+++ b/src/plugins/imageformats/CMakeLists.txt
@@ -1,6 +1,4 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from imageformats.pro.
-
add_subdirectory(svg)
diff --git a/src/plugins/imageformats/svg/CMakeLists.txt b/src/plugins/imageformats/svg/CMakeLists.txt
index b74a9f2..140e281 100644
--- a/src/plugins/imageformats/svg/CMakeLists.txt
+++ b/src/plugins/imageformats/svg/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from svg.pro.
-
#####################################################################
## QSvgPlugin Plugin:
#####################################################################
@@ -18,6 +16,3 @@ qt_internal_add_plugin(QSvgPlugin
Qt::Gui
Qt::Svg
)
-
-#### Keys ignored in scope 1:.:.:svg.pro:<TRUE>:
-# PLUGIN_EXTENDS = "svg"
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index b748184..ff2c0df 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -1,20 +1,16 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from svg.pro.
-
#####################################################################
## Svg Module:
#####################################################################
-# special case begin
# Handle the conditional finding of either system zlib or qt zlib.
if(NOT QT_FEATURE_system_zlib)
find_package(Qt6 COMPONENTS ZlibPrivate)
elseif(NOT TARGET WrapZLIB::WrapZLIB)
qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
endif()
-# special case end
qt_internal_add_module(Svg
SOURCES
@@ -51,9 +47,6 @@ qt_internal_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUA
"/BASE:0x66000000"
)
-#### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_:
-# QMAKE_CXXFLAGS_RELEASE = "--O2"
-
qt_internal_extend_target(Svg CONDITION QT_FEATURE_system_zlib
LIBRARIES
WrapZLIB::WrapZLIB
@@ -66,4 +59,3 @@ qt_internal_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib
qt_internal_add_docs(Svg
doc/qtsvg.qdocconf
)
-
diff --git a/src/svgwidgets/CMakeLists.txt b/src/svgwidgets/CMakeLists.txt
index 5a4a42b..8708799 100644
--- a/src/svgwidgets/CMakeLists.txt
+++ b/src/svgwidgets/CMakeLists.txt
@@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from svgwidgets.pro.
-
#####################################################################
## SvgWidgets Module:
#####################################################################