summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@digia.com>2014-05-19 15:34:22 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-20 10:49:07 +0200
commit35a2f0880831d38c60d2b4820dac808f48f6f3a8 (patch)
tree7a9bcc1366d8338245a26ec5e5fdb87d42925272
parent24aedcb90a6f274c6329ccfcd0ab83f7e1d0ec7d (diff)
downloadqtsvg-35a2f0880831d38c60d2b4820dac808f48f6f3a8.tar.gz
Remove obsolete dependency on QtXmlv5.3.1stable5.3.1
A while a go, QtSvg was changed to use the QXmlStream* classes from QtCore. Now, only tests/auto/qsvggenerator is left with a QtXml dependency. This patch also reverts commit b719b93770393bbf20251e1dffc70498061e612c Change-Id: I67417a27aa66a2db6d1985cad73e5bab806ad7d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--examples/svg/svgviewer/svgviewer.pro2
-rw-r--r--src/plugins/imageformats/svg/svg.pro2
-rw-r--r--src/svg/svg.pro6
-rw-r--r--tests/auto/qicon_svg/qicon_svg.pro2
-rw-r--r--tests/auto/qsvgdevice/qsvgdevice.pro2
5 files changed, 4 insertions, 10 deletions
diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro
index eb2088c..157af4d 100644
--- a/examples/svg/svgviewer/svgviewer.pro
+++ b/examples/svg/svgviewer/svgviewer.pro
@@ -4,7 +4,7 @@ RESOURCES = svgviewer.qrc
SOURCES = main.cpp \
mainwindow.cpp \
svgview.cpp
-QT += widgets svg xml
+QT += widgets svg
qtHaveModule(opengl): QT += opengl
diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro
index 26324af..ce1881f 100644
--- a/src/plugins/imageformats/svg/svg.pro
+++ b/src/plugins/imageformats/svg/svg.pro
@@ -8,4 +8,4 @@ load(qt_plugin)
HEADERS += qsvgiohandler.h
SOURCES += main.cpp \
qsvgiohandler.cpp
-QT += xml svg
+QT += svg
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index e868e61..f2906ce 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -53,9 +53,3 @@ contains(QT_CONFIG, system-zlib) {
else: \
INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib
}
-
-ANDROID_LIB_DEPENDENCIES = \
- lib/libQt5Xml.so
-
-ANDROID_BUNDLED_FILES += \
- lib/libQt5Xml.so
diff --git a/tests/auto/qicon_svg/qicon_svg.pro b/tests/auto/qicon_svg/qicon_svg.pro
index 87e26be..643717c 100644
--- a/tests/auto/qicon_svg/qicon_svg.pro
+++ b/tests/auto/qicon_svg/qicon_svg.pro
@@ -6,7 +6,7 @@ SOURCES += tst_qicon_svg.cpp
RESOURCES = tst_qicon_svg.qrc
wince* {
- QT += xml svg
+ QT += svg
DEPLOYMENT_PLUGIN += qsvg
}
TESTDATA += icons/*
diff --git a/tests/auto/qsvgdevice/qsvgdevice.pro b/tests/auto/qsvgdevice/qsvgdevice.pro
index d423faa..4be7c44 100644
--- a/tests/auto/qsvgdevice/qsvgdevice.pro
+++ b/tests/auto/qsvgdevice/qsvgdevice.pro
@@ -1,5 +1,5 @@
TARGET = tst_qsvgdevice
CONFIG += testcase
SOURCES += tst_qsvgdevice.cpp
-QT += xml testlib widgets gui-private
+QT += testlib widgets gui-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0