summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dist/changes-5.12.420
-rw-r--r--tests/auto/auto.pro3
-rw-r--r--tests/auto/qsvggenerator/qsvggenerator.pro3
-rw-r--r--tests/auto/qsvggenerator/tst_qsvggenerator.cpp2
-rw-r--r--tests/auto/qsvgplugin/qsvgplugin.pro1
-rw-r--r--tests/auto/qsvgplugin/tst_qsvgplugin.cpp33
6 files changed, 42 insertions, 20 deletions
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 0000000..a285cd8
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,20 @@
+Qt 5.12.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.3.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index e2d84ec..925e4cd 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -3,12 +3,13 @@ qtHaveModule(widgets) {
SUBDIRS = \
qsvgdevice \
qsvggenerator \
- qsvgrenderer \
qsvgplugin \
qicon_svg \
cmake \
installed_cmake
+ !android: SUBDIRS += qsvgrenderer
+
installed_cmake.depends = cmake
}
!cross_compile: SUBDIRS += host.pro
diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro
index fd0edfa..1b6f329 100644
--- a/tests/auto/qsvggenerator/qsvggenerator.pro
+++ b/tests/auto/qsvggenerator/qsvggenerator.pro
@@ -4,4 +4,5 @@ QT += svg xml testlib widgets gui-private
SOURCES += tst_qsvggenerator.cpp
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
+RESOURCES += referenceSvgs/fileName_output.svg \
+ referenceSvgs/radial_gradient.svg
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
index b55b687..9217a5b 100644
--- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
+++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp
@@ -122,7 +122,7 @@ static void checkFile(const QString &fileName)
QFile file(fileName);
QVERIFY(file.open(QIODevice::ReadOnly));
- QFile referenceFile(SRCDIR "referenceSvgs/" + fileName);
+ QFile referenceFile(QFINDTESTDATA("referenceSvgs/" + fileName));
QVERIFY(referenceFile.open(QIODevice::ReadOnly));
compareWithoutFontInfo(file.readAll(), referenceFile.readAll());
diff --git a/tests/auto/qsvgplugin/qsvgplugin.pro b/tests/auto/qsvgplugin/qsvgplugin.pro
index 3fec52e..657b511 100644
--- a/tests/auto/qsvgplugin/qsvgplugin.pro
+++ b/tests/auto/qsvgplugin/qsvgplugin.pro
@@ -5,4 +5,3 @@ QT += svg testlib widgets gui-private
SOURCES += tst_qsvgplugin.cpp
RESOURCES += resources.qrc
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
index da49b75..e1f84f3 100644
--- a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
+++ b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
@@ -79,18 +79,18 @@ void tst_QSvgPlugin::checkSize_data()
QTest::addColumn<int>("imageHeight");
QTest::addColumn<int>("imageWidth");
- QTest::newRow("square") << SRCDIR "square.svg" << 50 << 50;
- QTest::newRow("square_size") << SRCDIR "square_size.svg" << 200 << 200;
- QTest::newRow("square_size_viewbox") << SRCDIR "square_size_viewbox.svg" << 200 << 200;
- QTest::newRow("square_viewbox") << SRCDIR "square_viewbox.svg" << 100 << 100;
- QTest::newRow("tall") << SRCDIR "tall.svg" << 50 << 25;
- QTest::newRow("tall_size") << SRCDIR "tall_size.svg" << 200 << 100;
- QTest::newRow("tall_size_viewbox") << SRCDIR "tall_size_viewbox.svg" << 200 << 100;
- QTest::newRow("tall_viewbox") << SRCDIR "tall_viewbox.svg" << 100 << 50;
- QTest::newRow("wide") << SRCDIR "wide.svg" << 25 << 50;
- QTest::newRow("wide_size") << SRCDIR "wide_size.svg" << 100 << 200;
- QTest::newRow("wide_size_viewbox") << SRCDIR "wide_size_viewbox.svg" << 100 << 200;
- QTest::newRow("wide_viewbox") << SRCDIR "wide_viewbox.svg" << 50 << 100;
+ QTest::newRow("square") << QFINDTESTDATA("square.svg") << 50 << 50;
+ QTest::newRow("square_size") << QFINDTESTDATA("square_size.svg") << 200 << 200;
+ QTest::newRow("square_size_viewbox") << QFINDTESTDATA("square_size_viewbox.svg") << 200 << 200;
+ QTest::newRow("square_viewbox") << QFINDTESTDATA("square_viewbox.svg") << 100 << 100;
+ QTest::newRow("tall") << QFINDTESTDATA("tall.svg") << 50 << 25;
+ QTest::newRow("tall_size") << QFINDTESTDATA("tall_size.svg") << 200 << 100;
+ QTest::newRow("tall_size_viewbox") << QFINDTESTDATA("tall_size_viewbox.svg") << 200 << 100;
+ QTest::newRow("tall_viewbox") << QFINDTESTDATA("tall_viewbox.svg") << 100 << 50;
+ QTest::newRow("wide") << QFINDTESTDATA("wide.svg") << 25 << 50;
+ QTest::newRow("wide_size") << QFINDTESTDATA("wide_size.svg") << 100 << 200;
+ QTest::newRow("wide_size_viewbox") << QFINDTESTDATA("wide_size_viewbox.svg") << 100 << 200;
+ QTest::newRow("wide_viewbox") << QFINDTESTDATA("wide_viewbox.svg") << 50 << 100;
}
void tst_QSvgPlugin::checkSize()
@@ -116,7 +116,8 @@ void tst_QSvgPlugin::checkSize()
void tst_QSvgPlugin::checkImageInclude()
{
- const QString filename(SRCDIR "imageInclude.svg");
+ const QString filename(QFINDTESTDATA("imageInclude.svg"));
+ const QString path = filename.left(filename.size() - strlen("imageInclude.svg"));
QFile file(filename);
file.open(QIODevice::ReadOnly);
@@ -132,9 +133,9 @@ void tst_QSvgPlugin::checkImageInclude()
file.close();
QCOMPARE(logMessages.size(), 8);
- QCOMPARE(logMessages.at(0), QString("Could not create image from \"%1notExisting.svg\"").arg(SRCDIR));
- QCOMPARE(logMessages.at(1), QString("Could not create image from \"%1./notExisting.svg\"").arg(SRCDIR));
- QCOMPARE(logMessages.at(2), QString("Could not create image from \"%1../notExisting.svg\"").arg(SRCDIR));
+ QCOMPARE(logMessages.at(0), QString("Could not create image from \"%1notExisting.svg\"").arg(path));
+ QCOMPARE(logMessages.at(1), QString("Could not create image from \"%1./notExisting.svg\"").arg(path));
+ QCOMPARE(logMessages.at(2), QString("Could not create image from \"%1../notExisting.svg\"").arg(path));
QCOMPARE(logMessages.at(3), QString("Could not create image from \"%1notExisting.svg\"").arg(QDir::rootPath()));
QCOMPARE(logMessages.at(4), QLatin1String("Could not create image from \":/notExisting.svg\""));
QCOMPARE(logMessages.at(5), QLatin1String("Could not create image from \"qrc:///notExisting.svg\""));
View Lorry Controller Status