diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/svg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/svg/.prev_CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/svgwidgets/CMakeLists.txt | 14 |
5 files changed, 23 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 344fbe5..4d059f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,6 @@ if(TARGET Qt::Gui) add_subdirectory(svg) add_subdirectory(plugins) endif() - if(TARGET Qt::Widgets) add_subdirectory(svgwidgets) endif() diff --git a/src/plugins/iconengines/svgiconengine/CMakeLists.txt b/src/plugins/iconengines/svgiconengine/CMakeLists.txt index 545e124..9371b6e 100644 --- a/src/plugins/iconengines/svgiconengine/CMakeLists.txt +++ b/src/plugins/iconengines/svgiconengine/CMakeLists.txt @@ -4,7 +4,7 @@ ## QSvgIconPlugin Plugin: ##################################################################### -qt_add_plugin(QSvgIconPlugin +qt_internal_add_plugin(QSvgIconPlugin OUTPUT_NAME qsvgicon TYPE iconengines SOURCES diff --git a/src/plugins/imageformats/svg/CMakeLists.txt b/src/plugins/imageformats/svg/CMakeLists.txt index 4d9619c..cec6f77 100644 --- a/src/plugins/imageformats/svg/CMakeLists.txt +++ b/src/plugins/imageformats/svg/CMakeLists.txt @@ -4,7 +4,7 @@ ## QSvgPlugin Plugin: ##################################################################### -qt_add_plugin(QSvgPlugin +qt_internal_add_plugin(QSvgPlugin OUTPUT_NAME qsvg TYPE imageformats SOURCES diff --git a/src/svg/.prev_CMakeLists.txt b/src/svg/.prev_CMakeLists.txt index 31374ee..c29103d 100644 --- a/src/svg/.prev_CMakeLists.txt +++ b/src/svg/.prev_CMakeLists.txt @@ -32,6 +32,15 @@ qt_add_module(Svg ## Scopes: ##################################################################### +qt_extend_target(Svg CONDITION TARGET Qt::Widgets + LIBRARIES + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Widgets + PRIVATE_MODULE_INTERFACE + Qt::WidgetsPrivate +) + qt_extend_target(Svg 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 afbe83e..59551ba 100644 --- a/src/svgwidgets/CMakeLists.txt +++ b/src/svgwidgets/CMakeLists.txt @@ -1,12 +1,14 @@ +# Generated from svgwidgets.pro. + ##################################################################### ## SvgWidgets Module: ##################################################################### qt_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_extend_target(SvgWidgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") + LINK_OPTIONS + "/BASE:0x66000000" +) |