Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I886cfdcd8bd124a02c54f23b694799610f60d7bd

9 files changed, 71 insertions, 47 deletions

diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
new file mode 100644
index 0000000..d33db21
--- /dev/null
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from auto.pro.
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(qsvgdevice)
+    add_subdirectory(qsvggenerator)
+    add_subdirectory(qsvgplugin)
+    add_subdirectory(qicon_svg)
+    add_subdirectory(cmake)
+    add_subdirectory(installed_cmake)
+endif()
+if(TARGET Qt::Widgets AND NOT ANDROID)
+    add_subdirectory(qsvgrenderer)
+endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 7fa439e..31b62c6 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,15 +1,15 @@
 # Generated from auto.pro.
 
-
 if(TARGET Qt::Widgets)
     add_subdirectory(qsvgdevice)
     if(TARGET Qt::Xml) # special case
         add_subdirectory(qsvggenerator) # special case
     endif() # special case
-    add_subdirectory(qsvgrenderer)
     add_subdirectory(qsvgplugin)
     add_subdirectory(qicon_svg)
+    # add_subdirectory(cmake) # special case remove
+    # add_subdirectory(installed_cmake) # special case remove
 endif()
-
-if(NOT cross_compile)
+if(TARGET Qt::Widgets AND NOT ANDROID)
+    add_subdirectory(qsvgrenderer)
 endif()
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/CMakeLists.txt b/tests/auto/qsvggenerator/CMakeLists.txt
index 0903d80..039f7db 100644
--- a/tests/auto/qsvggenerator/CMakeLists.txt
+++ b/tests/auto/qsvggenerator/CMakeLists.txt
@@ -5,10 +5,9 @@
 #####################################################################
 
 add_qt_test(tst_qsvggenerator
+    GUI
     SOURCES
         tst_qsvggenerator.cpp
-    DEFINES
-        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
     LIBRARIES
         Qt::GuiPrivate
     PUBLIC_LIBRARIES
@@ -18,5 +17,16 @@ add_qt_test(tst_qsvggenerator
         Qt::Xml
 )
 
-#### Keys ignored in scope 1:.:.:qsvggenerator.pro:<TRUE>:
-# CONFIG = "testcase"
+# Resources:
+set(qmake_immediate_resource_files
+    "referenceSvgs/fileName_output.svg"
+    "referenceSvgs/radial_gradient.svg"
+)
+
+add_qt_resource(tst_qsvggenerator "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
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/CMakeLists.txt b/tests/auto/qsvgplugin/CMakeLists.txt
index aa67c41..19ee765 100644
--- a/tests/auto/qsvgplugin/CMakeLists.txt
+++ b/tests/auto/qsvgplugin/CMakeLists.txt
@@ -8,8 +8,6 @@ add_qt_test(tst_qsvgplugin
     GUI
     SOURCES
         tst_qsvgplugin.cpp
-    DEFINES
-        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
     LIBRARIES
         Qt::GuiPrivate
     PUBLIC_LIBRARIES
@@ -19,26 +17,27 @@ add_qt_test(tst_qsvgplugin
 )
 
 # Resources:
+set(resources_resource_files
+    "imageInclude.svg"
+    "imageIncludeA.svg"
+    "square.svg"
+    "square_size.svg"
+    "square_size_viewbox.svg"
+    "square_viewbox.svg"
+    "tall.svg"
+    "tall_size.svg"
+    "tall_size_viewbox.svg"
+    "tall_viewbox.svg"
+    "wide.svg"
+    "wide_size.svg"
+    "wide_size_viewbox.svg"
+    "wide_viewbox.svg"
+)
+
 add_qt_resource(tst_qsvgplugin "resources"
     PREFIX
         "/"
     FILES
-        imageInclude.svg
-        imageIncludeA.svg
-        square.svg
-        square_size.svg
-        square_size_viewbox.svg
-        square_viewbox.svg
-        tall.svg
-        tall_size.svg
-        tall_size_viewbox.svg
-        tall_viewbox.svg
-        wide.svg
-        wide_size.svg
-        wide_size_viewbox.svg
-        wide_viewbox.svg
+        ${resources_resource_files}
 )
 
-
-#### Keys ignored in scope 1:.:.:qsvgplugin.pro:<TRUE>:
-# CONFIG = "testcase"
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\""));