summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qicon_svg/qicon_svg.pro3
-rw-r--r--tests/auto/qsvggenerator/qsvggenerator.pro12
-rw-r--r--tests/auto/qsvggenerator/tst_qsvggenerator.cpp12
-rw-r--r--tests/auto/qsvgrenderer/qsvgrenderer.pro10
4 files changed, 9 insertions, 28 deletions
diff --git a/tests/auto/qicon_svg/qicon_svg.pro b/tests/auto/qicon_svg/qicon_svg.pro
index 5e24892..a0558fd 100644
--- a/tests/auto/qicon_svg/qicon_svg.pro
+++ b/tests/auto/qicon_svg/qicon_svg.pro
@@ -5,7 +5,4 @@ QT += svg testlib gui-private
SOURCES += tst_qicon_svg.cpp
RESOURCES = tst_qicon_svg.qrc
-wince* {
- DEPLOYMENT_PLUGIN += qsvg
-}
TESTDATA += icons/*
diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro
index 73149ae..fd0edfa 100644
--- a/tests/auto/qsvggenerator/qsvggenerator.pro
+++ b/tests/auto/qsvggenerator/qsvggenerator.pro
@@ -4,14 +4,4 @@ QT += svg xml testlib widgets gui-private
SOURCES += tst_qsvggenerator.cpp
-wince* {
- addFiles.files = referenceSvgs
- addFiles.path = .
- DEPLOYMENT += addFiles
-}
-
-wince* {
- DEFINES += SRCDIR=\\\"\\\"
-} else {
- DEFINES += SRCDIR=\\\"$$PWD/\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
index db7e3e5..4795b55 100644
--- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
+++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
@@ -99,10 +99,14 @@ static void compareWithoutFontInfo(const QByteArray &source, const QByteArray &r
QDomDocument referenceDoc;
referenceDoc.setContent(reference);
- QList<QString> fontAttributes;
- fontAttributes << "font-family" << "font-size" << "font-weight" << "font-style";
-
- foreach (QString attribute, fontAttributes) {
+ const QString fontAttributes[] = {
+ "font-family",
+ "font-size",
+ "font-weight",
+ "font-style",
+ };
+
+ for (const QString &attribute : fontAttributes) {
removeAttribute(sourceDoc, attribute);
removeAttribute(referenceDoc, attribute);
}
diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro
index 42e5ccd..d1173ae 100644
--- a/tests/auto/qsvgrenderer/qsvgrenderer.pro
+++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro
@@ -5,14 +5,4 @@ QT += svg testlib widgets gui-private
SOURCES += tst_qsvgrenderer.cpp
RESOURCES += resources.qrc
-wince* {
- addFiles.files = *.svg *.svgz
- addFiles.path = .
-
- DEPLOYMENT += addFiles
- wince*|qt_not_deployed {
- DEPLOYMENT_PLUGIN += qsvg
- }
-}
-
DEFINES += SRCDIR=\\\"$$PWD/\\\"