From ed550e572dacc7c244813c4fcbffef9fc1b8f06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 4 Sep 2023 16:54:38 +0200 Subject: Rename qt_attribution.json test file qtattributionsscanner features a 'test mode' since quite some time. Let's also use it in tests/manual, so that scanning the qt source code doesn't bring up this 'test attribution'. Pick-to: 6.2 6.5 6.6 Change-Id: I6e3ae4ee91bad42bb57a07a84dfcbbab75e1e537 Reviewed-by: Joerg Bornemann --- tests/manual/qtattributionsscanner/data/qt_attribution.json | 11 ----------- .../qtattributionsscanner/data/qt_attribution_test.json | 11 +++++++++++ tests/manual/qtattributionsscanner/qtattributionsscanner.pro | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 tests/manual/qtattributionsscanner/data/qt_attribution.json create mode 100644 tests/manual/qtattributionsscanner/data/qt_attribution_test.json (limited to 'tests') diff --git a/tests/manual/qtattributionsscanner/data/qt_attribution.json b/tests/manual/qtattributionsscanner/data/qt_attribution.json deleted file mode 100644 index adc97d3b6..000000000 --- a/tests/manual/qtattributionsscanner/data/qt_attribution.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Id": "exampleattribution", - "Name": "Example Attribution", - "QDocModule": "somemodule", - "Description": "Does nothing specific.", - "QtUsage": "Optionally compiled into Some Qt Module. To avoid, pass \\c -no-somemodule or \\c -system-somemodule to \\c configure.", - "License": "GNU General Public License v3.0 only", - "LicenseId": "GPL-3.0", - "LicenseFile": "LICENSE", - "Copyright": "Copyright (C) 2016 The Qt Company Ltd." -} diff --git a/tests/manual/qtattributionsscanner/data/qt_attribution_test.json b/tests/manual/qtattributionsscanner/data/qt_attribution_test.json new file mode 100644 index 000000000..adc97d3b6 --- /dev/null +++ b/tests/manual/qtattributionsscanner/data/qt_attribution_test.json @@ -0,0 +1,11 @@ +{ + "Id": "exampleattribution", + "Name": "Example Attribution", + "QDocModule": "somemodule", + "Description": "Does nothing specific.", + "QtUsage": "Optionally compiled into Some Qt Module. To avoid, pass \\c -no-somemodule or \\c -system-somemodule to \\c configure.", + "License": "GNU General Public License v3.0 only", + "LicenseId": "GPL-3.0", + "LicenseFile": "LICENSE", + "Copyright": "Copyright (C) 2016 The Qt Company Ltd." +} diff --git a/tests/manual/qtattributionsscanner/qtattributionsscanner.pro b/tests/manual/qtattributionsscanner/qtattributionsscanner.pro index c3bcf99e3..74ad8eb7b 100644 --- a/tests/manual/qtattributionsscanner/qtattributionsscanner.pro +++ b/tests/manual/qtattributionsscanner/qtattributionsscanner.pro @@ -5,7 +5,7 @@ DISTFILES += test.qdocconf overview.qdoc data/qt_attribution.json data/LICENSE run_qtattributionsscanner.commands = $$[QT_HOST_BINS]/qtattributionsscanner \ --filter QDocModule=somemodule -o generated.qdoc $$PWD -run_docs.commands = BUILDDIR=$$OUT_PWD $$[QT_HOST_BINS]/qdoc $$PWD/test.qdocconf +run_docs.commands = QT_ATTRIBUTIONSSCANNER_TEST=1 BUILDDIR=$$OUT_PWD $$[QT_HOST_BINS]/qdoc $$PWD/test.qdocconf check.depends = run_qtattributionsscanner run_docs -- cgit v1.2.3