summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-02-09 17:04:22 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-02-11 16:43:53 +0100
commit126411bb98a20626718ad23aafdcb8c57097c184 (patch)
tree2e75169737f4df4b6c9fa850c0ded17e66f298ac
parent883fdf51a9f2319bf11f33eee65551ef11efeb00 (diff)
downloadqtsvg-126411bb98a20626718ad23aafdcb8c57097c184.tar.gz
Remove QMake project files
This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I99eb79f677b4fff3f3336371d91c841de5198ffc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r--.prev_CMakeLists.txt16
-rw-r--r--qtsvg.pro1
-rw-r--r--src/plugins/iconengines/iconengines.pro3
-rw-r--r--src/plugins/iconengines/svgiconengine/svgiconengine.pro13
-rw-r--r--src/plugins/imageformats/imageformats.pro2
-rw-r--r--src/plugins/imageformats/svg/svg.pro11
-rw-r--r--src/plugins/plugins.pro5
-rw-r--r--src/src.pro4
-rw-r--r--src/svg/.prev_CMakeLists.txt64
-rw-r--r--src/svg/svg.pro40
-rw-r--r--src/svgwidgets/.prev_CMakeLists.txt35
-rw-r--r--src/svgwidgets/svgwidgets.pro16
-rw-r--r--tests/.prev_CMakeLists.txt7
-rw-r--r--tests/auto/.prev_CMakeLists.txt13
-rw-r--r--tests/auto/auto.pro15
-rw-r--r--tests/auto/cmake/cmake.pro7
-rw-r--r--tests/auto/host.pro4
-rw-r--r--tests/auto/installed_cmake/installed_cmake.pro4
-rw-r--r--tests/auto/qicon_svg/.prev_CMakeLists.txt39
-rw-r--r--tests/auto/qicon_svg/qicon_svg.pro8
-rw-r--r--tests/auto/qsvgdevice/qsvgdevice.pro4
-rw-r--r--tests/auto/qsvggenerator/qsvggenerator.pro8
-rw-r--r--tests/auto/qsvgplugin/qsvgplugin.pro7
-rw-r--r--tests/auto/qsvgrenderer/qsvgrenderer.pro8
-rw-r--r--tests/tests.pro2
25 files changed, 0 insertions, 336 deletions
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
deleted file mode 100644
index c72c853..0000000
--- a/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated from qtsvg.pro.
-
-cmake_minimum_required(VERSION 3.15.0)
-
-include(.cmake.conf)
-project(QtSvg
- VERSION "${QT_REPO_MODULE_VERSION}"
- DESCRIPTION "Qt Svg Libraries"
- HOMEPAGE_URL "https://qt.io/"
- LANGUAGES CXX C
-)
-
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
-
-qt_build_repo()
diff --git a/qtsvg.pro b/qtsvg.pro
deleted file mode 100644
index 58c33f2..0000000
--- a/qtsvg.pro
+++ /dev/null
@@ -1 +0,0 @@
-load(qt_parts)
diff --git a/src/plugins/iconengines/iconengines.pro b/src/plugins/iconengines/iconengines.pro
deleted file mode 100644
index 21bb8a7..0000000
--- a/src/plugins/iconengines/iconengines.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += svgiconengine
diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
deleted file mode 100644
index bfc739f..0000000
--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = qsvgicon
-
-HEADERS += qsvgiconengine.h
-SOURCES += main.cpp \
- qsvgiconengine.cpp
-OTHER_FILES += qsvgiconengine.json
-OTHER_FILES += qsvgiconengine-nocompress.json
-QT += svg core-private gui-private
-
-PLUGIN_TYPE = iconengines
-PLUGIN_EXTENDS = svg
-PLUGIN_CLASS_NAME = QSvgIconPlugin
-load(qt_plugin)
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
deleted file mode 100644
index edffb73..0000000
--- a/src/plugins/imageformats/imageformats.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += svg
diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro
deleted file mode 100644
index 9db6a9a..0000000
--- a/src/plugins/imageformats/svg/svg.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = qsvg
-
-HEADERS += qsvgiohandler.h
-SOURCES += main.cpp \
- qsvgiohandler.cpp
-QT += svg
-
-PLUGIN_TYPE = imageformats
-PLUGIN_EXTENDS = svg
-PLUGIN_CLASS_NAME = QSvgPlugin
-load(qt_plugin)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
deleted file mode 100644
index 6be129a..0000000
--- a/src/plugins/plugins.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-QT_FOR_CONFIG += gui
-qtConfig(imageformatplugin): SUBDIRS += imageformats
-SUBDIRS += iconengines
diff --git a/src/src.pro b/src/src.pro
deleted file mode 100644
index 1a1d4d4..0000000
--- a/src/src.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-qtHaveModule(gui): SUBDIRS += svg plugins
-qtHaveModule(widgets): SUBDIRS += svgwidgets
diff --git a/src/svg/.prev_CMakeLists.txt b/src/svg/.prev_CMakeLists.txt
deleted file mode 100644
index 3da6f44..0000000
--- a/src/svg/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-# Generated from svg.pro.
-
-#####################################################################
-## Svg Module:
-#####################################################################
-
-qt_internal_add_module(Svg
- SOURCES
- qsvgfont.cpp qsvgfont_p.h
- qsvggenerator.cpp qsvggenerator.h
- qsvggraphics.cpp qsvggraphics_p.h
- qsvghandler.cpp qsvghandler_p.h
- qsvgnode.cpp qsvgnode_p.h
- qsvgrenderer.cpp qsvgrenderer.h
- qsvgstructure.cpp qsvgstructure_p.h
- qsvgstyle.cpp qsvgstyle_p.h
- qsvgtinydocument.cpp qsvgtinydocument_p.h
- qtsvgglobal.h
- DEFINES
- QT_NO_USING_NAMESPACE
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- PUBLIC_LIBRARIES
- Qt::Core
- Qt::Gui
- PRIVATE_MODULE_INTERFACE
- Qt::CorePrivate
- Qt::GuiPrivate
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(Svg CONDITION TARGET Qt::Widgets
- LIBRARIES
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Widgets
- PRIVATE_MODULE_INTERFACE
- Qt::WidgetsPrivate
-)
-
-qt_internal_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
- LINK_OPTIONS
- "/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
- ZLIB::ZLIB
-)
-
-qt_internal_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib
- LIBRARIES
- Qt::ZlibPrivate
-)
-qt_internal_add_docs(Svg
- doc/qtsvg.qdocconf
-)
-
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
deleted file mode 100644
index 9d70df8..0000000
--- a/src/svg/svg.pro
+++ /dev/null
@@ -1,40 +0,0 @@
-TARGET = QtSvg
-QT = core-private gui-private
-qtHaveModule(widgets): QT += widgets-private
-
-DEFINES += QT_NO_USING_NAMESPACE
-msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000
-solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
-
-QMAKE_DOCS = $$PWD/doc/qtsvg.qdocconf
-
-HEADERS += \
- qsvggraphics_p.h \
- qsvghandler_p.h \
- qsvgnode_p.h \
- qsvgstructure_p.h \
- qsvgstyle_p.h \
- qsvgfont_p.h \
- qsvgtinydocument_p.h \
- qsvgrenderer.h \
- qsvggenerator.h \
- qtsvgglobal.h
-
-
-SOURCES += \
- qsvggraphics.cpp \
- qsvghandler.cpp \
- qsvgnode.cpp \
- qsvgstructure.cpp \
- qsvgstyle.cpp \
- qsvgfont.cpp \
- qsvgtinydocument.cpp \
- qsvgrenderer.cpp \
- qsvggenerator.cpp
-
-qtConfig(system-zlib): \
- QMAKE_USE_PRIVATE += zlib
-else: \
- QT_PRIVATE += zlib-private
-
-load(qt_module)
diff --git a/src/svgwidgets/.prev_CMakeLists.txt b/src/svgwidgets/.prev_CMakeLists.txt
deleted file mode 100644
index 5f2ae6f..0000000
--- a/src/svgwidgets/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated from svgwidgets.pro.
-
-#####################################################################
-## SvgWidgets Module:
-#####################################################################
-
-qt_internal_add_module(SvgWidgets
- SOURCES
- qgraphicssvgitem.cpp qgraphicssvgitem.h
- qsvgwidget.cpp qsvgwidget.h
- qtsvgwidgetsglobal.h
- DEFINES
- QT_NO_USING_NAMESPACE
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
- PUBLIC_LIBRARIES
- Qt::Core
- Qt::Gui
- Qt::Svg
- Qt::Widgets
- PRIVATE_MODULE_INTERFACE
- Qt::CorePrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(SvgWidgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
- LINK_OPTIONS
- "/BASE:0x66000000"
-)
diff --git a/src/svgwidgets/svgwidgets.pro b/src/svgwidgets/svgwidgets.pro
deleted file mode 100644
index 2f99b56..0000000
--- a/src/svgwidgets/svgwidgets.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TARGET = QtSvgWidgets
-QT += svg core-private gui-private widgets-private
-
-DEFINES += QT_NO_USING_NAMESPACE
-msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000
-
-HEADERS += \
- qtsvgwidgetsglobal.h \
- qsvgwidget.h \
- qgraphicssvgitem.h
-
-SOURCES += \
- qsvgwidget.cpp \
- qgraphicssvgitem.cpp
-
-load(qt_module)
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
deleted file mode 100644
index 2214137..0000000
--- a/tests/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated from tests.pro.
-
-if(QT_BUILD_STANDALONE_TESTS)
- # Add qt_find_package calls for extra dependencies that need to be found when building
- # the standalone tests here.
-endif()
-qt_build_tests()
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
deleted file mode 100644
index d33db21..0000000
--- a/tests/auto/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from auto.pro.
-
-if(TARGET Qt::Widgets)
- add_subdirectory(qsvgdevice)
- add_subdirectory(qsvggenerator)
- add_subdirectory(qsvgplugin)
- add_subdirectory(qicon_svg)
- add_subdirectory(cmake)
- add_subdirectory(installed_cmake)
-endif()
-if(TARGET Qt::Widgets AND NOT ANDROID)
- add_subdirectory(qsvgrenderer)
-endif()
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
deleted file mode 100644
index 925e4cd..0000000
--- a/tests/auto/auto.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE=subdirs
-qtHaveModule(widgets) {
- SUBDIRS = \
- qsvgdevice \
- qsvggenerator \
- qsvgplugin \
- qicon_svg \
- cmake \
- installed_cmake
-
- !android: SUBDIRS += qsvgrenderer
-
- installed_cmake.depends = cmake
-}
-!cross_compile: SUBDIRS += host.pro
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
deleted file mode 100644
index 4463bd0..0000000
--- a/tests/auto/cmake/cmake.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Cause make to do nothing.
-TEMPLATE = subdirs
-
-CMAKE_QT_MODULES_UNDER_TEST = svg
-
-CONFIG += ctest_testcase
diff --git a/tests/auto/host.pro b/tests/auto/host.pro
deleted file mode 100644
index 4095052..0000000
--- a/tests/auto/host.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
-
-
diff --git a/tests/auto/installed_cmake/installed_cmake.pro b/tests/auto/installed_cmake/installed_cmake.pro
deleted file mode 100644
index 14d0b28..0000000
--- a/tests/auto/installed_cmake/installed_cmake.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../cmake/cmake.pro)
-
-CONFIG -= ctest_testcase
-CONFIG += ctest_testcase_installed
diff --git a/tests/auto/qicon_svg/.prev_CMakeLists.txt b/tests/auto/qicon_svg/.prev_CMakeLists.txt
deleted file mode 100644
index 61f60fa..0000000
--- a/tests/auto/qicon_svg/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated from qicon_svg.pro.
-
-#####################################################################
-## tst_qicon_svg Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
- icons/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_internal_add_test(tst_qicon_svg
- SOURCES
- tst_qicon_svg.cpp
- PUBLIC_LIBRARIES
- Qt::Gui
- Qt::GuiPrivate
- Qt::Svg
- TESTDATA ${test_data}
-)
-
-# Resources:
-set(tst_qicon_svg_resource_files
- "./icons/heart.svg"
- "./icons/heart.svgz"
- "./icons/image.png"
- "./icons/rect.svg"
- "./icons/rect_size_100percent.svg"
- "./icons/trash.svg"
-)
-
-qt_internal_add_resource(tst_qicon_svg "tst_qicon_svg"
- PREFIX
- "/"
- FILES
- ${tst_qicon_svg_resource_files}
-)
-
diff --git a/tests/auto/qicon_svg/qicon_svg.pro b/tests/auto/qicon_svg/qicon_svg.pro
deleted file mode 100644
index 77558f9..0000000
--- a/tests/auto/qicon_svg/qicon_svg.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG += testcase testcase_lowdpi
-TARGET = tst_qicon_svg
-
-QT += svg testlib gui-private
-SOURCES += tst_qicon_svg.cpp
-RESOURCES = tst_qicon_svg.qrc
-
-TESTDATA += icons/*
diff --git a/tests/auto/qsvgdevice/qsvgdevice.pro b/tests/auto/qsvgdevice/qsvgdevice.pro
deleted file mode 100644
index a9f4b2f..0000000
--- a/tests/auto/qsvgdevice/qsvgdevice.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET = tst_qsvgdevice
-CONFIG += testcase
-SOURCES += tst_qsvgdevice.cpp
-QT += testlib widgets gui-private
diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro
deleted file mode 100644
index 1b6f329..0000000
--- a/tests/auto/qsvggenerator/qsvggenerator.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = tst_qsvggenerator
-CONFIG += testcase
-QT += svg xml testlib widgets gui-private
-
-SOURCES += tst_qsvggenerator.cpp
-
-RESOURCES += referenceSvgs/fileName_output.svg \
- referenceSvgs/radial_gradient.svg
diff --git a/tests/auto/qsvgplugin/qsvgplugin.pro b/tests/auto/qsvgplugin/qsvgplugin.pro
deleted file mode 100644
index 657b511..0000000
--- a/tests/auto/qsvgplugin/qsvgplugin.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET = tst_qsvgplugin
-CONFIG += testcase
-QT += svg testlib widgets gui-private
-
-SOURCES += tst_qsvgplugin.cpp
-RESOURCES += resources.qrc
-
diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro
deleted file mode 100644
index d1173ae..0000000
--- a/tests/auto/qsvgrenderer/qsvgrenderer.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET = tst_qsvgrenderer
-CONFIG += testcase
-QT += svg testlib widgets gui-private
-
-SOURCES += tst_qsvgrenderer.cpp
-RESOURCES += resources.qrc
-
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/tests.pro b/tests/tests.pro
deleted file mode 100644
index 85e4f3a..0000000
--- a/tests/tests.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += auto