From d8a971b8475035f61e1ad3baaef6a8c49556c42d Mon Sep 17 00:00:00 2001
From: Paul Wicking <paul.wicking@qt.io>
Date: Fri, 14 Feb 2020 06:46:33 +0100
Subject: QDoc: Reorganize expected output test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../excludes/parentinclude.qdoc                    | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc

(limited to 'tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc')

diff --git a/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc
new file mode 100644
index 000000000..c95e22125
--- /dev/null
+++ b/tests/auto/qdoc/generatedoutput/testdata/includefromexampledirs/excludes/parentinclude.qdoc
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 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$
+**
+****************************************************************************/
+
+/*!
+//! abstract-type
+    \qmltype AbstractParent
+    \ingroup qmltypes
+    \qmlabstract
+    \brief Abstract base QML type.
+//! abstract-type
+*/
+
+/*!
+//! children-qmlproperty
+    \qmlproperty list<Child> AbstractParent::children
+    \default
+    \brief Children of the type.
+//! children-qmlproperty
+*/
+
+/*!
+//! rear-qmlmethod
+    \qmlmethod void AbstractParent::rear(Child child)
+    \brief Do some abstract parenting on \a child.
+//! rear-qmlmethod
+*/
+
+/*!
+    \qmltype Child
+    \ingroup qmltypes
+    \inherits AbstractParent
+    \brief A Child inheriting its parent.
+*/
+
+/*!
+    \qmlbasictype int
+    \ingroup qmltypes
+    \brief An integer basic type.
+*/
-- 
cgit v1.2.3