summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-09-22 16:06:15 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-09-22 18:01:26 +0200
commit82e05da0aea85bc92ff045b77c10220eed0e4dfd (patch)
tree6d9281de2bab3ecc61c230e42f318f6439a98811 /src
parent317e3f3dcd8645c4c1b7cec7d3ad142e96e6c440 (diff)
downloadqtsvg-82e05da0aea85bc92ff045b77c10220eed0e4dfd.tar.gz
CMake: Regenerate projects before API change
Task-number: QTBUG-86815 Change-Id: I2b5975cc1995518f1995955d9b655ab26e764ad0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/plugins/iconengines/svgiconengine/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/svg/CMakeLists.txt2
-rw-r--r--src/svg/.prev_CMakeLists.txt9
-rw-r--r--src/svgwidgets/CMakeLists.txt14
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"
+)