From 43641c422da7fbcebb044b62720c3c2960cc1264 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 16:11:32 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: Ie75a59430afde730291fb3b3e01fb4822f543e2f Reviewed-by: Joerg Bornemann --- src/svg/.prev_CMakeLists.txt | 12 ++++++------ src/svg/CMakeLists.txt | 12 ++++++------ src/svgwidgets/.prev_CMakeLists.txt | 16 +++++++++++++--- src/svgwidgets/CMakeLists.txt | 4 ++-- tests/auto/qicon_svg/.prev_CMakeLists.txt | 4 ++-- tests/auto/qicon_svg/CMakeLists.txt | 4 ++-- tests/auto/qsvgdevice/CMakeLists.txt | 2 +- tests/auto/qsvggenerator/CMakeLists.txt | 4 ++-- tests/auto/qsvgplugin/CMakeLists.txt | 4 ++-- tests/auto/qsvgrenderer/CMakeLists.txt | 4 ++-- 10 files changed, 38 insertions(+), 28 deletions(-) diff --git a/src/svg/.prev_CMakeLists.txt b/src/svg/.prev_CMakeLists.txt index c29103d..3da6f44 100644 --- a/src/svg/.prev_CMakeLists.txt +++ b/src/svg/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Svg Module: ##################################################################### -qt_add_module(Svg +qt_internal_add_module(Svg SOURCES qsvgfont.cpp qsvgfont_p.h qsvggenerator.cpp qsvggenerator.h @@ -32,7 +32,7 @@ qt_add_module(Svg ## Scopes: ##################################################################### -qt_extend_target(Svg CONDITION TARGET Qt::Widgets +qt_internal_extend_target(Svg CONDITION TARGET Qt::Widgets LIBRARIES Qt::WidgetsPrivate PUBLIC_LIBRARIES @@ -41,7 +41,7 @@ qt_extend_target(Svg CONDITION TARGET Qt::Widgets Qt::WidgetsPrivate ) -qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x66000000" ) @@ -49,16 +49,16 @@ qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") #### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -qt_extend_target(Svg CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(Svg CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib LIBRARIES Qt::ZlibPrivate ) -qt_add_docs(Svg +qt_internal_add_docs(Svg doc/qtsvg.qdocconf ) diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt index ca09b70..1d3b23e 100644 --- a/src/svg/CMakeLists.txt +++ b/src/svg/CMakeLists.txt @@ -13,7 +13,7 @@ elseif(NOT TARGET ZLIB::ZLIB) endif() # special case end -qt_add_module(Svg +qt_internal_add_module(Svg SOURCES qsvgfont.cpp qsvgfont_p.h qsvggenerator.cpp qsvggenerator.h @@ -41,7 +41,7 @@ qt_add_module(Svg ## Scopes: ##################################################################### -qt_extend_target(Svg CONDITION TARGET Qt::Widgets +qt_internal_extend_target(Svg CONDITION TARGET Qt::Widgets LIBRARIES Qt::WidgetsPrivate PUBLIC_LIBRARIES @@ -50,7 +50,7 @@ qt_extend_target(Svg CONDITION TARGET Qt::Widgets Qt::WidgetsPrivate ) -qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x66000000" ) @@ -58,16 +58,16 @@ qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") #### Keys ignored in scope 4:.:.:svg.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" -qt_extend_target(Svg CONDITION QT_FEATURE_system_zlib +qt_internal_extend_target(Svg CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB ) -qt_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib +qt_internal_extend_target(Svg CONDITION NOT QT_FEATURE_system_zlib LIBRARIES Qt::ZlibPrivate ) -qt_add_docs(Svg +qt_internal_add_docs(Svg doc/qtsvg.qdocconf ) diff --git a/src/svgwidgets/.prev_CMakeLists.txt b/src/svgwidgets/.prev_CMakeLists.txt index afbe83e..5f2ae6f 100644 --- a/src/svgwidgets/.prev_CMakeLists.txt +++ b/src/svgwidgets/.prev_CMakeLists.txt @@ -1,12 +1,14 @@ +# Generated from svgwidgets.pro. + ##################################################################### ## SvgWidgets Module: ##################################################################### -qt_add_module(SvgWidgets +qt_internal_add_module(SvgWidgets SOURCES - qtsvgwidgetsglobal.h qgraphicssvgitem.cpp qgraphicssvgitem.h qsvgwidget.cpp qsvgwidget.h + qtsvgwidgetsglobal.h DEFINES QT_NO_USING_NAMESPACE LIBRARIES @@ -16,10 +18,18 @@ qt_add_module(SvgWidgets PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::Widgets 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/CMakeLists.txt b/src/svgwidgets/CMakeLists.txt index 59551ba..5f2ae6f 100644 --- a/src/svgwidgets/CMakeLists.txt +++ b/src/svgwidgets/CMakeLists.txt @@ -4,7 +4,7 @@ ## SvgWidgets Module: ##################################################################### -qt_add_module(SvgWidgets +qt_internal_add_module(SvgWidgets SOURCES qgraphicssvgitem.cpp qgraphicssvgitem.h qsvgwidget.cpp qsvgwidget.h @@ -29,7 +29,7 @@ qt_add_module(SvgWidgets ## Scopes: ##################################################################### -qt_extend_target(SvgWidgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") +qt_internal_extend_target(SvgWidgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") LINK_OPTIONS "/BASE:0x66000000" ) diff --git a/tests/auto/qicon_svg/.prev_CMakeLists.txt b/tests/auto/qicon_svg/.prev_CMakeLists.txt index 54b8666..61f60fa 100644 --- a/tests/auto/qicon_svg/.prev_CMakeLists.txt +++ b/tests/auto/qicon_svg/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob icons/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qicon_svg +qt_internal_add_test(tst_qicon_svg SOURCES tst_qicon_svg.cpp PUBLIC_LIBRARIES @@ -30,7 +30,7 @@ set(tst_qicon_svg_resource_files "./icons/trash.svg" ) -qt_add_resource(tst_qicon_svg "tst_qicon_svg" +qt_internal_add_resource(tst_qicon_svg "tst_qicon_svg" PREFIX "/" FILES diff --git a/tests/auto/qicon_svg/CMakeLists.txt b/tests/auto/qicon_svg/CMakeLists.txt index bbdfe5f..8c3fb88 100644 --- a/tests/auto/qicon_svg/CMakeLists.txt +++ b/tests/auto/qicon_svg/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob icons/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qicon_svg +qt_internal_add_test(tst_qicon_svg LOWDPI # special case SOURCES tst_qicon_svg.cpp @@ -31,7 +31,7 @@ set(tst_qicon_svg_resource_files "./icons/trash.svg" ) -qt_add_resource(tst_qicon_svg "tst_qicon_svg" +qt_internal_add_resource(tst_qicon_svg "tst_qicon_svg" PREFIX "/" FILES diff --git a/tests/auto/qsvgdevice/CMakeLists.txt b/tests/auto/qsvgdevice/CMakeLists.txt index bd39a40..bcbdf54 100644 --- a/tests/auto/qsvgdevice/CMakeLists.txt +++ b/tests/auto/qsvgdevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsvgdevice Test: ##################################################################### -qt_add_test(tst_qsvgdevice +qt_internal_add_test(tst_qsvgdevice SOURCES tst_qsvgdevice.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qsvggenerator/CMakeLists.txt b/tests/auto/qsvggenerator/CMakeLists.txt index 2f1d835..45b3ebe 100644 --- a/tests/auto/qsvggenerator/CMakeLists.txt +++ b/tests/auto/qsvggenerator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsvggenerator Test: ##################################################################### -qt_add_test(tst_qsvggenerator +qt_internal_add_test(tst_qsvggenerator SOURCES tst_qsvggenerator.cpp PUBLIC_LIBRARIES @@ -21,7 +21,7 @@ set(qmake_immediate_resource_files "referenceSvgs/radial_gradient.svg" ) -qt_add_resource(tst_qsvggenerator "qmake_immediate" +qt_internal_add_resource(tst_qsvggenerator "qmake_immediate" PREFIX "/" FILES diff --git a/tests/auto/qsvgplugin/CMakeLists.txt b/tests/auto/qsvgplugin/CMakeLists.txt index dbd33c5..5a8835a 100644 --- a/tests/auto/qsvgplugin/CMakeLists.txt +++ b/tests/auto/qsvgplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsvgplugin Test: ##################################################################### -qt_add_test(tst_qsvgplugin +qt_internal_add_test(tst_qsvgplugin SOURCES tst_qsvgplugin.cpp PUBLIC_LIBRARIES @@ -32,7 +32,7 @@ set(resources_resource_files "wide_viewbox.svg" ) -qt_add_resource(tst_qsvgplugin "resources" +qt_internal_add_resource(tst_qsvgplugin "resources" PREFIX "/" FILES diff --git a/tests/auto/qsvgrenderer/CMakeLists.txt b/tests/auto/qsvgrenderer/CMakeLists.txt index dce6a08..26d263e 100644 --- a/tests/auto/qsvgrenderer/CMakeLists.txt +++ b/tests/auto/qsvgrenderer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsvgrenderer Test: ##################################################################### -qt_add_test(tst_qsvgrenderer +qt_internal_add_test(tst_qsvgrenderer SOURCES tst_qsvgrenderer.cpp DEFINES @@ -21,7 +21,7 @@ set(resources_resource_files "heart.svgz" ) -qt_add_resource(tst_qsvgrenderer "resources" +qt_internal_add_resource(tst_qsvgrenderer "resources" PREFIX "/" FILES -- cgit v1.2.1