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 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/svg') 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 ) -- cgit v1.2.1