Improve qdoccommandlineparser test

* For some reason the test wasn't included as a subdir any more.
  Add it back to the suite of QDoc tests.
* Remove the check for QA pages option in the test, as that option
  is gone from QDoc.
* Change the at-file path argument in the test, so that the test
  can be run regardless of PWD.
* Add a .qrc file to ensure that tst_arguments.txt is preserved also
  in out-of-source builds.

Fixes: QTBUG-84472
Change-Id: I6296222c3437d2f6a885a2919edc73da3ec39155
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

5 files changed, 36 insertions, 5 deletions

diff --git a/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt
index 6bf74a90a..68da67c5d 100644
--- a/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt
+++ b/tests/auto/qdoc/qdoccommandlineparser/.prev_CMakeLists.txt
@@ -11,3 +11,16 @@ qt_add_test(tst_qdoccommandlineparser
     INCLUDE_DIRECTORIES
         ../../../../src/qdoc
 )
+
+# Resources:
+set(tst_qdoccommandlineparser_resource_files
+    "tst_arguments.txt"
+)
+
+qt_add_resource(tst_qdoccommandlineparser "tst_qdoccommandlineparser"
+    PREFIX
+        "/"
+    FILES
+        ${tst_qdoccommandlineparser_resource_files}
+)
+
diff --git a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt
index a1b102cb0..f3d75e501 100644
--- a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt
+++ b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt
@@ -12,3 +12,16 @@ qt_add_test(tst_qdoccommandlineparser
     INCLUDE_DIRECTORIES
         ../../../../src/qdoc
 )
+
+# Resources:
+set(tst_qdoccommandlineparser_resource_files
+    "tst_arguments.txt"
+)
+
+qt_add_resource(tst_qdoccommandlineparser "tst_qdoccommandlineparser"
+    PREFIX
+        "/"
+    FILES
+        ${tst_qdoccommandlineparser_resource_files}
+)
+
diff --git a/tests/auto/qdoc/qdoccommandlineparser/qdoccommandlineparser.pro b/tests/auto/qdoc/qdoccommandlineparser/qdoccommandlineparser.pro
index c84a38bc5..eeb69a5fc 100644
--- a/tests/auto/qdoc/qdoccommandlineparser/qdoccommandlineparser.pro
+++ b/tests/auto/qdoc/qdoccommandlineparser/qdoccommandlineparser.pro
@@ -9,3 +9,6 @@ HEADERS += \
 SOURCES += \
     $$PWD/../../../../src/qdoc/qdoccommandlineparser.cpp \
     tst_qdoccommandlineparser.cpp
+
+RESOURCES += \
+    tst_qdoccommandlineparser.qrc
diff --git a/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.cpp b/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.cpp
index d5e8483a1..e3918fb5e 100644
--- a/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.cpp
+++ b/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.cpp
@@ -119,7 +119,6 @@ void tst_QDocCommandLineParser::process()
     QVERIFY(!parser.isSet(parser.generateOption));
     QVERIFY(!parser.isSet(parser.logProgressOption));
     QVERIFY(!parser.isSet(parser.singleExecOption));
-    QVERIFY(!parser.isSet(parser.writeQaPagesOption));
     QVERIFY(!parser.isSet(parser.frameworkOption));
 
     const QStringList expectedPositionalArgument = {
@@ -130,9 +129,8 @@ void tst_QDocCommandLineParser::process()
 
 void tst_QDocCommandLineParser::argumentsFromCommandLineAndFile()
 {
-    const QStringList arguments =
-        QStringLiteral("/src/qt5/qtbase/bin/qdoc "
-                       "@tst_arguments.txt").split(" ");
+    const QString atFilePath("@" + QFINDTESTDATA("tst_arguments.txt"));
+    const QStringList arguments { "/src/qt5/qtbase/bin/qdoc", atFilePath };
 
     QDocCommandLineParser parser;
     parser.process(arguments);
@@ -180,7 +178,6 @@ void tst_QDocCommandLineParser::argumentsFromCommandLineAndFile()
     QVERIFY(!parser.isSet(parser.generateOption));
     QVERIFY(!parser.isSet(parser.logProgressOption));
     QVERIFY(!parser.isSet(parser.singleExecOption));
-    QVERIFY(!parser.isSet(parser.writeQaPagesOption));
     QVERIFY(!parser.isSet(parser.frameworkOption));
 
     QCOMPARE(parser.positionalArguments(), expectedPositionalArgument);
diff --git a/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.qrc b/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.qrc
new file mode 100644
index 000000000..9a45cf68c
--- /dev/null
+++ b/tests/auto/qdoc/qdoccommandlineparser/tst_qdoccommandlineparser.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>tst_arguments.txt</file>
+    </qresource>
+</RCC>