QDoc: Reorganize expected output testv5.15.0-beta1

As the test has grown in size and scope, the lack of structure adds an
unnecessary mental overhead when adding new tests, or when attempting to
refactor the tests themselves.

- Place all testdata in a directory aptly named testdata, following Qt
  convention.
- Create sub-directories for all tests, so that their data is separated
  from each other.
- Update qdocconf-files to match the new structure.
- Update expected output data to match changes in qdocconf-files.
- Ensure all tests still run; this requires modifications to paths in
  .qdocconf files mostly, but also in #include directives.

Fixes: QTBUG-82159
Change-Id: I43b2333cacc75d1076a8aca86e89ccc52e4ec8a3
Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

1 files changed, 175 insertions, 0 deletions

diff --git a/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
new file mode 100644
index 000000000..5d3055ac2
--- /dev/null
+++ b/tests/auto/qdoc/generatedoutput/testdata/testcpp/testcpp.cpp
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "testcpp.h"
+
+namespace TestQDoc {
+
+/*!
+    \module TestCPP
+    \qtvariable testcpp
+    \title QDoc Test C++ Classes
+    \brief A test module page.
+*/
+
+/*!
+    \namespace TestQDoc
+    \inheaderfile TestCPP
+    \inmodule TestCPP
+    \brief A namespace.
+
+    \section1 Usage
+    This namespace is for testing QDoc output.
+*/
+
+/*!
+    \class TestQDoc::Test
+    \inmodule TestCPP
+    \brief A class in a namespace.
+
+\if defined(test_ignoresince)
+    //! omitted by ignoresince
+    \since 1.1
+\endif
+*/
+
+/*!
+    \class TestQDoc::TestDerived
+    \inmodule TestCPP
+    \brief A derived class in a namespace.
+*/
+
+/*!
+    \macro QDOCTEST_MACRO
+    \relates TestQDoc
+\if defined(test_ignoresince)
+    //! omitted by ignoresince.Test
+    \since Test 0.9
+\endif
+*/
+
+/*!
+    \macro QDOCTEST_MACRO2(x)
+    \relates TestQDoc::Test
+    \since Test 1.1
+    \brief A macro with argument \a x.
+*/
+
+/*!
+    \deprecated
+
+    Use someFunction() instead.
+*/
+void Test::deprecatedMember()
+{
+    return;
+}
+
+/*!
+    \obsolete
+
+    Use someFunction() instead.
+*/
+void Test::obsoleteMember()
+{
+    return;
+}
+
+/*!
+    \obsolete
+
+    Use obsoleteMember() instead.
+*/
+void Test::anotherObsoleteMember()
+{
+    return;
+}
+
+/*!
+    Function that takes a parameter \a i and \a b.
+\if defined(test_ignoresince)
+    \since 2.0
+\endif
+*/
+void Test::someFunctionDefaultArg(int i, bool b = false)
+{
+    return;
+}
+
+/*!
+    Function that takes a parameter \a v.
+    Also returns the value of \a v.
+\if defined(test_ignoresince)
+    \since Test 1.0
+\endif
+*/
+int Test::someFunction(int v)
+{
+    return v;
+}
+
+/*!
+    \fn void TestQDoc::Test::inlineFunction()
+
+    \brief An inline function, documented using the \CMDFN QDoc command.
+*/
+
+/*!
+    Function that must be reimplemented.
+*/
+void Test::virtualFun()
+{
+    return;
+}
+
+/*!
+    \reimp
+*/
+void TestDerived::virtualFun()
+{
+    return;
+}
+
+/*!
+    \fn TestQDoc::Test::overload()
+    \fn Test::overload(bool b)
+     //! The second overload should match even without the fully qualified path
+
+    Overloads that share a documentation comment, optionally taking
+    a parameter \a b.
+*/
+
+/*!
+\if defined(test_template)
+    \fn template <typename T1, typename T2> void TestQDoc::Test::funcTemplate(T1 a, T2 b)
+    \brief Function template with two parameters, \a a and \a b.
+\else
+    //! nothing
+\endif
+*/
+
+} // namespace TestQDoc