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/svgwidgets/.prev_CMakeLists.txt | 16 +++++++++++++--- src/svgwidgets/CMakeLists.txt | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'src/svgwidgets') 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" ) -- cgit v1.2.1