diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:06:32 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-01-28 10:58:22 +0100 |
| commit | 05cf5241950daeb5d6ccbf66c60faaefa09a7480 (patch) | |
| tree | 9e7b64c678e7c4bac719701e6e94955f9b092432 /tests | |
| parent | eac773c8dfd0e2166db53c88f5aa0c1e85933cac (diff) | |
| parent | f71baa5ee6603cf4e6e408306453c8278dfe0c43 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I30a35e0998cd2538406ae5e11e2991f855f4ecb5
Diffstat (limited to 'tests')
5 files changed, 105 insertions, 13 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html index d4c278659..363a4bf16 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html @@ -73,12 +73,12 @@ <div class="qmlitem"><div class="fngroup"> <div class="qmlproto"> <div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="fourth-prop"> -<td class="tblQmlPropNode"><p> -<span class="name">fourth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> <tr valign="top" class="odd" id="fifth-prop"> <td class="tblQmlPropNode"><p> <span class="name">fifth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<tr valign="top" class="odd" id="fourth-prop"> +<td class="tblQmlPropNode"><p> +<span class="name">fourth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> </table></div></div> </div><div class="qmldoc"><p>A group of properties sharing a documentation comment.</p> </div></div><!-- @@@ --> @@ -161,12 +161,12 @@ <div class="qmlitem"><div class="fngroup"> <div class="qmlproto"> <div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="enable-method"> -<td class="tblQmlFuncNode"><p> -<span class="name">enable</span>()</p></td></tr> <tr valign="top" class="odd" id="disable-method"> <td class="tblQmlFuncNode"><p> <span class="name">disable</span>()</p></td></tr> +<tr valign="top" class="odd" id="enable-method"> +<td class="tblQmlFuncNode"><p> +<span class="name">enable</span>()</p></td></tr> </table></div></div> </div><div class="qmldoc"><p>Enables or disables this type.</p> </div></div><!-- @@@ --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html new file mode 100644 index 000000000..aa80b49df --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html @@ -0,0 +1,25 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> +<!-- parent.qdoc --> + <title>List of All Members for AnotherChild | Test</title> +</head> +<body> +<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> +<h1 class="title">List of All Members for AnotherChild</h1> +<p>This is the complete list of members for <a href="qml-qdoc-test-anotherchild.html">AnotherChild</a>, including inherited members.</p> +<ul> +<li class="fn"><b><b><a href="qml-qdoc-test-anotherchild.html#name-prop">name</a></b></b> : string</li> +</ul> +<p>The following members are inherited from <a href="qml-qdoc-test-parent.html">Parent</a>.</p> +<ul> +<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b></b><ul> +<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b></b> : int</li> +<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b></b> : int</li> +<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b></b> : int</li> +</ul> +</li> +</ul> +</body> +</html> diff --git a/tests/auto/qdoc/generatedoutput/qmlpropertygroups/parent.qdoc b/tests/auto/qdoc/generatedoutput/qmlpropertygroups/parent.qdoc new file mode 100644 index 000000000..c7002e96b --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/qmlpropertygroups/parent.qdoc @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +/*! + \qmltype Parent + \inqmlmodule QDoc.Test + \brief Base QML type. +*/ + +/*! + \qmlproperty int Parent::group.c + \qmlproperty int Parent::group.a + \qmlproperty int Parent::group.b + \brief Property group. +*/ + +/*! + \qmltype AnotherChild + \inqmlmodule QDoc.Test + \inherits Parent + \brief Just another child inheriting a parent. +*/ + +/*! + \qmlproperty string AnotherChild::name + \brief Name of this child. +*/ diff --git a/tests/auto/qdoc/generatedoutput/qmlpropertygroups/qmlpropertygroups.qdocconf b/tests/auto/qdoc/generatedoutput/qmlpropertygroups/qmlpropertygroups.qdocconf new file mode 100644 index 000000000..6ed830c82 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/qmlpropertygroups/qmlpropertygroups.qdocconf @@ -0,0 +1,7 @@ +include(../testqml.qdocconf) + +includepaths += .. +sourcedirs += . + +HTML.nosubdirs = true +HTML.outputsubdir = qmlpropertygroups diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index 7d87470f6..3237bde26 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -60,6 +60,7 @@ private slots: void templateParameters(); void scopedEnum(); void dontDocument(); + void inheritedQmlPropertyGroups(); private: QScopedPointer<QTemporaryDir> m_outputDir; @@ -280,23 +281,30 @@ void tst_generatedOutput::ignoresinceVariable() void tst_generatedOutput::templateParameters() { - testAndCompare("testtemplate.qdocconf", "template/testqdoc-test.html " - "template/foo.html " - "template/bar.html " - "template/baz.html"); + testAndCompare("testtemplate.qdocconf", + "template/testqdoc-test.html " + "template/foo.html " + "template/bar.html " + "template/baz.html"); } void tst_generatedOutput::scopedEnum() { - testAndCompare("scopedenum.qdocconf", "scopedenum/testqdoc-test.html"); + testAndCompare("scopedenum.qdocconf", "scopedenum/testqdoc-test.html"); } void tst_generatedOutput::dontDocument() { - testAndCompare("dontdocument/dontdocument.qdocconf", "dontdocument/classes.html " - "dontdocument/seenclass.html"); + testAndCompare("dontdocument/dontdocument.qdocconf", + "dontdocument/classes.html " + "dontdocument/seenclass.html"); } +void tst_generatedOutput::inheritedQmlPropertyGroups() +{ + testAndCompare("qmlpropertygroups/qmlpropertygroups.qdocconf", + "qmlpropertygroups/qml-qdoc-test-anotherchild-members.html"); +} QTEST_APPLESS_MAIN(tst_generatedOutput) |