summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdoc/generatedoutput/testcpp.h
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-02-14 06:46:33 +0100
committerPaul Wicking <paul.wicking@qt.io>2020-02-21 10:49:59 +0100
commitd8a971b8475035f61e1ad3baaef6a8c49556c42d (patch)
treebaa6407243212f9de796e14fcb57bc216a769af8 /tests/auto/qdoc/generatedoutput/testcpp.h
parentd15236d9af91b32a43f3b2321eb776f6c2f2bf9c (diff)
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>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput/testcpp.h')
-rw-r--r--tests/auto/qdoc/generatedoutput/testcpp.h67
1 files changed, 0 insertions, 67 deletions
diff --git a/tests/auto/qdoc/generatedoutput/testcpp.h b/tests/auto/qdoc/generatedoutput/testcpp.h
deleted file mode 100644
index 4ae33a404..000000000
--- a/tests/auto/qdoc/generatedoutput/testcpp.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-#pragma once
-#define QDOCTEST_MACRO test
-#define QDOCTEST_MACRO2(x) (x) < 0 ? 0 : (x))
-
-namespace TestQDoc {
-
-class Test {
-public:
-#ifdef test_scopedenum
- enum class ScopedEnum : unsigned char {
- This = 0x01,
- That = 0x02,
- All = This | That,
- OmittedValue = 99
- };
-#endif
- int someFunction(int v);
- void someFunctionDefaultArg(int i, bool b);
- void obsoleteMember();
- void anotherObsoleteMember();
- void deprecatedMember();
- inline void inlineFunction() {};
- virtual void virtualFun();
-
-protected:
- void overload() {}
- void overload(bool b) { if (!b) return; }
-#ifdef test_template
- template <typename T1, typename T2> void funcTemplate(T1 a, T2 b) {
- a = b;
- }
-#endif
-};
-
-class TestDerived : public Test {
-public:
- void virtualFun() override;
-};
-
-} // namespace TestQDoc