summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-02-12 08:53:01 (GMT)
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-02-12 09:52:06 (GMT)
commit5c8d22a4374d5b5632d6e058c82160df22702b14 (patch)
tree63a722595b38b4d900fcd92f3dfa94828acb174b
parent41aa1dc3afa11c52d12cb5c2b7c69d0c8d36763e (diff)
downloadqtsvg-wip/cmake.tar.gz
Regenerate qtsvgwip/cmake
Change-Id: I6f444b939e14263a5f9f4ac7fdfcd0f45ccaa453 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/plugins/iconengines/svgiconengine/CMakeLists.txt11
-rw-r--r--src/plugins/imageformats/svg/CMakeLists.txt6
-rw-r--r--src/svg/.prev_CMakeLists.txt5
-rw-r--r--src/svg/CMakeLists.txt5
-rw-r--r--tests/auto/qicon_svg/CMakeLists.txt3
-rw-r--r--tests/auto/qsvgdevice/CMakeLists.txt3
-rw-r--r--tests/auto/qsvggenerator/CMakeLists.txt3
-rw-r--r--tests/auto/qsvgplugin/CMakeLists.txt3
-rw-r--r--tests/auto/qsvgrenderer/CMakeLists.txt3
9 files changed, 23 insertions, 19 deletions
diff --git a/src/plugins/iconengines/svgiconengine/CMakeLists.txt b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
index 2ddb15c..545e124 100644
--- a/src/plugins/iconengines/svgiconengine/CMakeLists.txt
+++ b/src/plugins/iconengines/svgiconengine/CMakeLists.txt
@@ -1,21 +1,20 @@
# Generated from svgiconengine.pro.
#####################################################################
-## qsvgicon Plugin:
+## QSvgIconPlugin Plugin:
#####################################################################
-qt_add_plugin(qsvgicon
+qt_add_plugin(QSvgIconPlugin
+ OUTPUT_NAME qsvgicon
TYPE iconengines
- CLASS_NAME QSvgIconPlugin
SOURCES
main.cpp
qsvgiconengine.cpp qsvgiconengine.h
- LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Core
+ Qt::CorePrivate
Qt::Gui
+ Qt::GuiPrivate
Qt::Svg
)
diff --git a/src/plugins/imageformats/svg/CMakeLists.txt b/src/plugins/imageformats/svg/CMakeLists.txt
index d7818c9..4d9619c 100644
--- a/src/plugins/imageformats/svg/CMakeLists.txt
+++ b/src/plugins/imageformats/svg/CMakeLists.txt
@@ -1,12 +1,12 @@
# Generated from svg.pro.
#####################################################################
-## qsvg Plugin:
+## QSvgPlugin Plugin:
#####################################################################
-qt_add_plugin(qsvg
+qt_add_plugin(QSvgPlugin
+ OUTPUT_NAME qsvg
TYPE imageformats
- CLASS_NAME QSvgPlugin
SOURCES
main.cpp
qsvgiohandler.cpp qsvgiohandler.h
diff --git a/src/svg/.prev_CMakeLists.txt b/src/svg/.prev_CMakeLists.txt
index b0bb9b6..30ed3e1 100644
--- a/src/svg/.prev_CMakeLists.txt
+++ b/src/svg/.prev_CMakeLists.txt
@@ -27,6 +27,9 @@ qt_add_module(Svg
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
+ PRIVATE_MODULE_INTERFACE
+ Qt::CorePrivate
+ Qt::GuiPrivate
)
## Scopes:
@@ -37,6 +40,8 @@ qt_extend_target(Svg CONDITION TARGET Qt::Widgets
Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Widgets
+ PRIVATE_MODULE_INTERFACE
+ Qt::WidgetsPrivate
)
qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 0906f1d..49d8531 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -29,6 +29,9 @@ qt_add_module(Svg
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
+ PRIVATE_MODULE_INTERFACE
+ Qt::CorePrivate
+ Qt::GuiPrivate
)
## Scopes:
@@ -39,6 +42,8 @@ qt_extend_target(Svg CONDITION TARGET Qt::Widgets
Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Widgets
+ PRIVATE_MODULE_INTERFACE
+ Qt::WidgetsPrivate
)
qt_extend_target(Svg CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
diff --git a/tests/auto/qicon_svg/CMakeLists.txt b/tests/auto/qicon_svg/CMakeLists.txt
index 7373cc7..54b8666 100644
--- a/tests/auto/qicon_svg/CMakeLists.txt
+++ b/tests/auto/qicon_svg/CMakeLists.txt
@@ -13,10 +13,9 @@ list(APPEND test_data ${test_data_glob})
qt_add_test(tst_qicon_svg
SOURCES
tst_qicon_svg.cpp
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Svg
TESTDATA ${test_data}
)
diff --git a/tests/auto/qsvgdevice/CMakeLists.txt b/tests/auto/qsvgdevice/CMakeLists.txt
index 479bd17..bd39a40 100644
--- a/tests/auto/qsvgdevice/CMakeLists.txt
+++ b/tests/auto/qsvgdevice/CMakeLists.txt
@@ -7,9 +7,8 @@
qt_add_test(tst_qsvgdevice
SOURCES
tst_qsvgdevice.cpp
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Widgets
)
diff --git a/tests/auto/qsvggenerator/CMakeLists.txt b/tests/auto/qsvggenerator/CMakeLists.txt
index e86ca91..2f1d835 100644
--- a/tests/auto/qsvggenerator/CMakeLists.txt
+++ b/tests/auto/qsvggenerator/CMakeLists.txt
@@ -7,10 +7,9 @@
qt_add_test(tst_qsvggenerator
SOURCES
tst_qsvggenerator.cpp
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Svg
Qt::Widgets
Qt::Xml
diff --git a/tests/auto/qsvgplugin/CMakeLists.txt b/tests/auto/qsvgplugin/CMakeLists.txt
index 673f39d..dbd33c5 100644
--- a/tests/auto/qsvgplugin/CMakeLists.txt
+++ b/tests/auto/qsvgplugin/CMakeLists.txt
@@ -7,10 +7,9 @@
qt_add_test(tst_qsvgplugin
SOURCES
tst_qsvgplugin.cpp
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Svg
Qt::Widgets
)
diff --git a/tests/auto/qsvgrenderer/CMakeLists.txt b/tests/auto/qsvgrenderer/CMakeLists.txt
index 43a3720..dce6a08 100644
--- a/tests/auto/qsvgrenderer/CMakeLists.txt
+++ b/tests/auto/qsvgrenderer/CMakeLists.txt
@@ -9,10 +9,9 @@ qt_add_test(tst_qsvgrenderer
tst_qsvgrenderer.cpp
DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
- LIBRARIES
- Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
+ Qt::GuiPrivate
Qt::Svg
Qt::Widgets
)