From b4b46151517be08a162f86c290edb16fdb71e001 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Fri, 22 Mar 2024 13:20:42 +0100 Subject: QDoc: Move properties test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `properties` test was already moved from `tst_generatedOutput` into `tst_validateQdocOutputFiles`. This change modifies the latter such that it includes the source for this particular test case, and removes the case from the former. Task-number: QTBUG-119500 Pick-to: 6.7 Change-Id: Iff241b15ca428ff5077a8bd050ad0a9891eb3031 Reviewed-by: Topi Reiniö --- .../properties-docbook/testqdoc-testderived.xml | 187 --------------------- .../properties/qml-themodule-thetype.html | 43 ----- .../expected_output/properties/testcpp.index | 122 -------------- .../properties/testqdoc-testderived-members.html | 50 ------ .../properties/testqdoc-testderived.html | 174 ------------------- .../testdata/configs/properties.qdocconf | 38 ----- .../tests/generatedoutput/tst_generatedoutput.cpp | 16 -- .../comprehensiveproject.qdocconf | 2 + .../expected/docbook/qml-themodule-thetype.xml | 43 +++++ .../expected/docbook/qmlmodules.xml | 6 + .../expected/docbook/testqdoc-testderived.xml | 176 ++++++++++++++++++- .../expected/docbook/themodule-qmlmodule.xml | 16 ++ .../html/qml-themodule-thetype-members.html | 19 +++ .../expected/html/qml-themodule-thetype.html | 45 +++++ .../expected/html/qmlmodules.html | 5 +- .../comprehensiveproject/expected/html/test.index | 42 +++++ .../comprehensiveproject/expected/html/test.qhp | 25 +++ .../html/testqdoc-testderived-members.html | 19 ++- .../expected/html/testqdoc-testderived.html | 93 +++++++++- .../expected/html/testtagfile.tags | 125 ++++++++++++++ .../expected/html/themodule-qmlmodule.html | 18 ++ .../expected/webxml/test.index | 42 +++++ .../expected/webxml/testqdoc-testderived.webxml | 91 ++++++++++ .../expected/webxml/testqdoc.webxml | 91 ++++++++++ .../expected/webxml/testtagfile.tags | 125 ++++++++++++++ .../expected/webxml/themodule-qmlmodule.webxml | 4 + 26 files changed, 982 insertions(+), 635 deletions(-) delete mode 100644 src/qdoc/qdoc/tests/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml delete mode 100644 src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/qml-themodule-thetype.html delete mode 100644 src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testcpp.index delete mode 100644 src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived-members.html delete mode 100644 src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived.html delete mode 100644 src/qdoc/qdoc/tests/generatedoutput/testdata/configs/properties.qdocconf create mode 100644 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-themodule-thetype.xml create mode 100644 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/themodule-qmlmodule.xml create mode 100644 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-themodule-thetype-members.html create mode 100644 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-themodule-thetype.html create mode 100644 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/themodule-qmlmodule.html create mode 100644 src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/themodule-qmlmodule.webxml diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml deleted file mode 100644 index ca14d8082..000000000 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties-docbook/testqdoc-testderived.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - -TestDerived Class -TestQDoc::TestDerived -TestCPP -TestCPP Reference Documentation - -A class in a namespace, derived from Test. -This class was introduced in Qt 2.0. - - - - -Header - -TestDerived - - - -Since - -Qt 2.0 - - - -CMake - -find_package(Qt6 REQUIRED COMPONENTS QDocTest) -target_link_libraries(mytarget PRIVATE Qt6::QDocTest) - - - -qmake - -QT += testcpp - - - -Inherited By - - - - - -Instantiated By - -qml-themodule-thetype.xml - - - -Inherits - -TestQDoc::Test - - - - -Detailed Description - - -Member Type Documentation - -[alias] TestDerived::DerivedType -An aliased typedef. - - -[alias] TestDerived::NotTypedef -I'm an alias, not a typedef. - - - -Property Documentation - -[bindable] bindableProp : QString -This property supports QProperty bindings. -Some property. - -See Also -See also - -someProp - - - - - -boolProp : bool -A boolean property. - -Access functions: - - - - -bool boolProp() - - -void setBoolProp(bool b) - - -void resetBoolProp() - - - -Notifier signal: - - - - -void boolPropChanged() - - - - -[read-only] intProp : int* const -An integer property. - -Access functions: - - - - -int *getInt() - - - - -[read-only] name : const QString* -This property holds a name. - -Access functions: - - - - -const QString *name() const - - - - -[bindable read-only] someProp : QString -This property supports QProperty bindings. -Another property. - - - -Member Function Documentation - -[private signal] void TestDerived::emitSomething() -Emitted when things happen. - -This is a private signal. It can be used in signal connections but cannot be emitted by the user. - - -[override virtual] int TestDerived::id() -Reimplements an access function for property: Test::id. - - -[invokable] void TestDerived::invokeMe() const -Something invokable. - -This function can be invoked via the meta-object system and from QML. See Q_INVOKABLE. - - - -TestQDoc::TestDerived::NotTypedef TestDerived::someValue() -Returns a value using an aliases type. - - -[override virtual] void TestDerived::virtualFun() -Reimplements: Test::virtualFun(). - - - -Obsolete Members for TestDerived -The following members of class TestDerived are deprecated. We strongly advise against using them in new code. - -Obsolete Member Function Documentation - -[static, deprecated] void TestDerived::staticObsoleteMember() -This function is deprecated. We strongly advise against using it in new code. -Static obsolete method. - - - - diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/qml-themodule-thetype.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/qml-themodule-thetype.html deleted file mode 100644 index f93da4dc8..000000000 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/qml-themodule-thetype.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - TheType QML Type | TestCPP - - -
  • TheType
    • -
    -
    -

    Contents

    - -
    -
    -

    TheType QML Type

    -
    -
    Import Statement: import TheModule
    Instantiates: TestDerived
    -

    Properties

    - - -

    Detailed Description

    - -

    Property Documentation

    - -
    -
    - - -

    -name : string [read-only]

    -

    Read-only status of this property is resolved from Q_PROPERTY.

    -
    -
    - - diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testcpp.index b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testcpp.index deleted file mode 100644 index 1f42a54ee..000000000 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testcpp.index +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived-members.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived-members.html deleted file mode 100644 index 20662a526..000000000 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived-members.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - List of All Members for TestDerived | TestCPP - - -
  • C++ Classes
    • -
  • TestDerived
    • -
    -

    List of All Members for TestDerived

    -

    This is the complete list of members for TestQDoc::TestDerived, including inherited members.

    -
    - -
    -
    - - diff --git a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived.html b/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived.html deleted file mode 100644 index 759d80157..000000000 --- a/src/qdoc/qdoc/tests/generatedoutput/expected_output/properties/testqdoc-testderived.html +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - TestDerived Class | TestCPP - - -
  • C++ Classes
    • -
  • TestDerived
    • -
    -
    -

    Contents

    - -
    -
    -

    TestDerived Class

    -class TestQDoc::TestDerived - -

    A class in a namespace, derived from Test. More...

    - -
    - - - - - - -
    Header: #include <TestDerived>
    CMake: find_package(Qt6 REQUIRED COMPONENTS QDocTest)
    -target_link_libraries(mytarget PRIVATE Qt6::QDocTest)
    qmake: QT += testcpp
    Since: Qt 2.0
    Instantiated By: TheType
    Inherits: TestQDoc::Test
    - -

    Public Types

    -
    - - -
    DerivedType
    NotTypedef
    -

    Properties

    -
    - -
    -
    -

    Public Functions

    -
    - - - - - - - -
    QBindable<QString> bindableProp()
    bool boolProp()
    int *getInt()
    void invokeMe() const
    const QString *name() const
    const QString &someProp()
    TestQDoc::TestDerived::NotTypedef someValue()
    -

    Reimplemented Public Functions

    -
    - - -
    virtual int id() override
    virtual void virtualFun() override
    -

    Public Slots

    -
    - - - -
    void resetBoolProp()
    void setBindableProp(const QString &s)
    void setBoolProp(bool b)
    -

    Signals

    -
    - - - -
    void bindablePropChanged()
    void boolPropChanged()
    void emitSomething()
    - -
    -

    Detailed Description

    -
    - -
    -

    Member Type Documentation

    - -

    [alias] TestDerived::DerivedType

    -

    An aliased typedef.

    - - -

    [alias] TestDerived::NotTypedef

    -

    I'm an alias, not a typedef.

    - -
    -
    -

    Property Documentation

    - -

    [bindable] bindableProp : QString

    -

    Note: This property supports QProperty bindings.

    -

    Some property.

    -

    See also someProp.

    - - -

    boolProp : bool

    -

    A boolean property.

    -

    Access functions:

    -
    - - - -
    bool boolProp()
    void setBoolProp(bool b)
    void resetBoolProp()
    -

    Notifier signal:

    -
    - -
    void boolPropChanged()
    - - -

    [read-only] intProp : int* const

    -

    An integer property.

    -

    Access functions:

    -
    - -
    int *getInt()
    - - -

    [read-only] name : const QString*

    -

    This property holds a name.

    -

    Access functions:

    -
    - -
    const QString *name() const
    - - -

    [bindable read-only] someProp : QString

    -

    Note: This property supports QProperty bindings.

    -

    Another property.

    - -
    -
    -

    Member Function Documentation

    - -

    [private signal] void TestDerived::emitSomething()

    -

    Emitted when things happen.

    -

    Note: This is a private signal. It can be used in signal connections but cannot be emitted by the user.

    -
    - -

    [override virtual] int TestDerived::id()

    -

    Reimplements an access function for property: Test::id.

    - - -

    [invokable] void TestDerived::invokeMe() const

    -

    Something invokable.

    -

    Note: This function can be invoked via the meta-object system and from QML. See Q_INVOKABLE.

    -
    - -

    TestQDoc::TestDerived::NotTypedef TestDerived::someValue()

    -

    Returns a value using an aliases type.

    - - -

    [override virtual] void TestDerived::virtualFun()

    -

    Reimplements: Test::virtualFun().

    - -
    - - diff --git a/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/properties.qdocconf b/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/properties.qdocconf deleted file mode 100644 index 440e619a1..000000000 --- a/src/qdoc/qdoc/tests/generatedoutput/testdata/configs/properties.qdocconf +++ /dev/null @@ -1,38 +0,0 @@ -sources.fileextensions = "*.qml *.cpp *.qdoc" -headers.fileextensions = "*.h" - -# images -imagedirs = ../images - -# zero warning policy -warninglimit = 0 -warninglimit.enabled = true - -# don't write host system-specific paths to index files -locationinfo = false - -project = TestCPP -includepaths += -I../testcpp - -headers = ../testcpp/testcpp.h -sources = ../testcpp/testcpp.cpp \ - ../testcpp/classlists.qdoc -exampledirs = ../testcpp/snippets - -macro.CMDFN = \\\\fn -macro.nothing = \\dontdocument () -macro.testnoautolist = \\if defined(test_noautolist)\n\\noautolist\n\\endif - -navigation.cppclassespage = "QDoc Test C++ Classes" - -defines += test_properties - -sources += ../testcpp/properties.qdoc - -outputformats = HTML DocBook -{HTML.nosubdirs,DocBook.nosubdirs} = true -HTML.outputsubdir = properties -DocBook.outputsubdir = properties-docbook - -# Allow link warning to Q_INVOKABLE -warninglimit += 1 diff --git a/src/qdoc/qdoc/tests/generatedoutput/tst_generatedoutput.cpp b/src/qdoc/qdoc/tests/generatedoutput/tst_generatedoutput.cpp index 7f95cc989..2bfeab3e6 100644 --- a/src/qdoc/qdoc/tests/generatedoutput/tst_generatedoutput.cpp +++ b/src/qdoc/qdoc/tests/generatedoutput/tst_generatedoutput.cpp @@ -28,7 +28,6 @@ private slots: void preparePhase(); void generatePhase(); void noAutoList(); - void properties(); private: QScopedPointer m_outputDir; @@ -270,21 +269,6 @@ void tst_generatedOutput::noAutoList() "noautolist-docbook/qdoc-test-qmlmodule.xml"); } -void tst_generatedOutput::properties() -{ - if (m_extraParams.isEmpty() && !m_regen) { - QSKIP("Required include paths not available"); - } - - testAndCompare("testdata/configs/properties.qdocconf", - "properties/testqdoc-testderived.html " - "properties/testqdoc-testderived-members.html " - "properties/qml-themodule-thetype.html " - "properties/testcpp.index " - "properties-docbook/testqdoc-testderived.xml", - m_extraParams.toLatin1().data()); -} - int main(int argc, char *argv[]) { tst_generatedOutput tc; diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf index b65e4eb5f..77c8a3287 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/comprehensiveproject.qdocconf @@ -28,6 +28,7 @@ headers = testcpp.h \ sources = testcpp.cpp \ classlists.qdoc \ dont.cpp \ + properties.qdoc \ unseenclass.qdoc exampledirs = snippets @@ -39,6 +40,7 @@ navigation.cppclassespage = "QDoc Test C++ Classes" defines += test_ignoresince defines += test_nestedmacro +defines += test_properties macro.ver = "\1" macro.ver.match = "^(\\d+\\.\\d+)" diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-themodule-thetype.xml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-themodule-thetype.xml new file mode 100644 index 000000000..13d125c8d --- /dev/null +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-themodule-thetype.xml @@ -0,0 +1,43 @@ + + + +TheType QML Type +Test +A test project for QDoc build artifacts + +A test project for QDoc build artifacts. + + + +Import Statement + +import TheModule + + + +Instantiates: + +TestDerived + + + + +Detailed Description + + +Property Documentation + +[read-only] name : string + +string +name +[read-only] + +public +active +unspecified + +Read-only status of this property is resolved from Q_PROPERTY. + + + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qmlmodules.xml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qmlmodules.xml index 0983927bd..af130ca0c 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qmlmodules.xml +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qmlmodules.xml @@ -21,6 +21,12 @@ +TheModule + + + + + UI Components Basic set of UI components. diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/testqdoc-testderived.xml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/testqdoc-testderived.xml index ccf5961c2..6f0147dcc 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/testqdoc-testderived.xml +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/testqdoc-testderived.xml @@ -45,7 +45,7 @@ Instantiated By -qml-test-nover-typenoversion.xml +qml-themodule-thetype.xml @@ -81,8 +81,182 @@ I'm an alias, not a typedef. + +Property Documentation + +[bindable] bindableProp : QString + +(Qt property) +QString +bindableProp +public +active +unspecified +bindableProp +setBindableProp +bindablePropChanged + +This property supports QProperty bindings. +Some property. + +See Also +See also + +someProp + + + + + +boolProp : bool + +(Qt property) +bool +boolProp +public +active +unspecified +boolProp +setBoolProp +resetBoolProp +boolPropChanged + +A boolean property. + +Access functions: + + + + +bool boolProp() + + +void setBoolProp(bool b) + + +void resetBoolProp() + + + +Notifier signal: + + + + +void boolPropChanged() + + + + +[read-only] intProp : int* const + +(Qt property) +int* +intProp +public +active +unspecified +getInt + +An integer property. + +Access functions: + + + + +int *getInt() + + + + +[read-only] name : const QString* + +(Qt property) +const QString* +name +public +active +unspecified +name + +This property holds a name. + +Access functions: + + + + +const QString *name() const + + + + +[bindable read-only] someProp : QString + +(Qt property) +QString +someProp +public +active +unspecified +someProp + +This property supports QProperty bindings. +Another property. + + Member Function Documentation + +[private signal] void TestDerived::emitSomething() + + +emitSomething + +signal +void emitSomething() +public +active +unspecified + +Emitted when things happen. + +This is a private signal. It can be used in signal connections but cannot be emitted by the user. + + +[override virtual] int TestDerived::id() + +virtual +int +id + +override +plain +int id() override +public +active +unspecified + + + +[invokable] void TestDerived::invokeMe() const + +const + +invokeMe + +plain +void invokeMe() const +public +active +unspecified + +Something invokable. + +This function can be invoked via the meta-object system and from QML. See Q_INVOKABLE. + + TestQDoc::TestDerived::NotTypedef TestDerived::someValue() diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/themodule-qmlmodule.xml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/themodule-qmlmodule.xml new file mode 100644 index 000000000..d3c4ed894 --- /dev/null +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/themodule-qmlmodule.xml @@ -0,0 +1,16 @@ + + + + +Test +A test project for QDoc build artifacts + +A test project for QDoc build artifacts. + + + + +TheType + + + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-themodule-thetype-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-themodule-thetype-members.html new file mode 100644 index 000000000..de3143219 --- /dev/null +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-themodule-thetype-members.html @@ -0,0 +1,19 @@ + + + + + + List of All Members for TheType | Test 6.2.11 + + +
  • Types
    • +
  • TheModule
    • +
  • TheType
    • +
    +

    List of All Members for TheType

    +

    This is the complete list of members for TheType, including inherited members.

    + + + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-themodule-thetype.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-themodule-thetype.html new file mode 100644 index 000000000..369d9358e --- /dev/null +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-themodule-thetype.html @@ -0,0 +1,45 @@ + + + + + + TheType QML Type | Test 6.2.11 + + +
  • Types
    • +
  • TheModule
    • +
  • TheType
    • +
    +
    +

    Contents

    + +
    +
    +

    TheType QML Type

    +
    +
    Import Statement: import TheModule
    Instantiates: TestDerived
    +

    Properties

    + + +

    Detailed Description

    + +

    Property Documentation

    + +
    +
    + + +

    +name : string [read-only]

    +

    Read-only status of this property is resolved from Q_PROPERTY.

    +
    +
    + + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qmlmodules.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qmlmodules.html index 61d19a809..bd0238d40 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qmlmodules.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qmlmodules.html @@ -21,8 +21,9 @@
    - - + + +

    No QML Types Here

    A QML module with no member types.

    QDoc.Test QML Module

    QML Types for the Test module.

    UI Components

    Basic set of UI components.

    Versionless QML Module

    QML Types for the Test module without version.

    TheModule

    UI Components

    Basic set of UI components.

    Versionless QML Module

    QML Types for the Test module without version.

    QML types

    diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.index b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.index index e6d43591c..8375090f0 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.index +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.index @@ -92,6 +92,7 @@ + @@ -145,13 +146,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -191,6 +232,7 @@ + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.qhp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.qhp index 67cb374cb..ba54e85ea 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.qhp +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/test.qhp @@ -7,6 +7,7 @@
    +
    @@ -103,6 +104,8 @@ + + @@ -113,6 +116,12 @@ + + + + + + @@ -124,6 +133,7 @@ + @@ -132,14 +142,18 @@ + + + + @@ -151,6 +165,9 @@ + + + @@ -159,10 +176,15 @@ + + + + + @@ -197,6 +219,8 @@ qml-test-nover-doctest.html qml-test-nover-typenoversion-members.html qml-test-nover-typenoversion.html + qml-themodule-thetype-members.html + qml-themodule-thetype.html qml-uicomponents-progressbar-members.html qml-uicomponents-progressbar.html qml-uicomponents-switch-members.html @@ -229,6 +253,7 @@ testqdoc-testderived-obsolete.html testqdoc-testderived.html testqdoc.html + themodule-qmlmodule.html uicomponents-qmlmodule.html diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-members.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-members.html index 4e0ef8264..f263a0b7b 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-members.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived-members.html @@ -12,22 +12,39 @@

    List of All Members for TestDerived

    This is the complete list of members for TestQDoc::TestDerived, including inherited members.

    -
      +
    + +
    +
    diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html index 6710af3f5..9fb47d89a 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testqdoc-testderived.html @@ -14,8 +14,11 @@

    Contents

    @@ -31,7 +34,7 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest) qmake: QT += testcpp Since: Qt 2.0 - Instantiated By: TypeNoVersion + Instantiated By: TheType Inherits: TestQDoc::Test
      @@ -43,14 +46,45 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest) DerivedType NotTypedef +

      Properties

      +
      + +
      +

      Public Functions

      + + + + + +
      QBindable<QString> bindableProp()
      bool boolProp()
      int *getInt()
      void invokeMe() const
      const QString *name() const
      const QString &someProp()
      TestQDoc::TestDerived::NotTypedef someValue()

      Reimplemented Public Functions

      +
      virtual int id() override
      virtual void virtualFun() override
      +

      Public Slots

      +
      + + + +
      void resetBoolProp()
      void setBindableProp(const QString &s)
      void setBoolProp(bool b)
      +

      Signals

      +
      + + + +
      void bindablePropChanged()
      void boolPropChanged()
      void emitSomething()

      Detailed Description

      @@ -67,8 +101,65 @@ target_link_libraries(mytarget PRIVATE Qt6::QDocTest)

      I'm an alias, not a typedef.

      +
      +

      Property Documentation

      + +

      [bindable] bindableProp : QString

      +

      Note: This property supports QProperty bindings.

      +

      Some property.

      +

      See also someProp.

      + + +

      boolProp : bool

      +

      A boolean property.

      +

      Access functions:

      +
      + + + +
      bool boolProp()
      void setBoolProp(bool b)
      void resetBoolProp()
      +

      Notifier signal:

      +
      + +
      void boolPropChanged()
      + + +

      [read-only] intProp : int* const

      +

      An integer property.

      +

      Access functions:

      +
      + +
      int *getInt()
      + + +

      [read-only] name : const QString*

      +

      This property holds a name.

      +

      Access functions:

      +
      + +
      const QString *name() const
      + + +

      [bindable read-only] someProp : QString

      +

      Note: This property supports QProperty bindings.

      +

      Another property.

      + +

      Member Function Documentation

      + +

      [private signal] void TestDerived::emitSomething()

      +

      Emitted when things happen.

      +

      Note: This is a private signal. It can be used in signal connections but cannot be emitted by the user.

      +
      + +

      [override virtual] int TestDerived::id()

      + + +

      [invokable] void TestDerived::invokeMe() const

      +

      Something invokable.

      +

      Note: This function can be invoked via the meta-object system and from QML. See Q_INVOKABLE.

      +

      TestQDoc::TestDerived::NotTypedef TestDerived::someValue()

      Returns a value using an aliases type.

      diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testtagfile.tags b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testtagfile.tags index 43c31fe85..f68dffed6 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testtagfile.tags +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/testtagfile.tags @@ -270,6 +270,13 @@ TestQDoc::TestDerived testqdoc-testderived.html Test + + QBindable<QString> + bindableProp + testqdoc-testderived.html + bindableProp-prop + () + TestQDoc::TestDerived::NotTypedef someValue @@ -277,6 +284,76 @@ someValue () + + bool + boolProp + testqdoc-testderived.html + boolProp-prop + () + + + const QString & + someProp + testqdoc-testderived.html + someProp-prop + () + + + int * + getInt + testqdoc-testderived.html + intProp-prop + () + + + virtual int + id + testqdoc-testderived.html + id + () override + + + void + bindablePropChanged + testqdoc-testderived.html + bindableProp-prop + () + + + void + boolPropChanged + testqdoc-testderived.html + boolProp-prop + () + + + void + emitSomething + testqdoc-testderived.html + emitSomething + () + + + void + resetBoolProp + testqdoc-testderived.html + boolProp-prop + () + + + void + setBindableProp + testqdoc-testderived.html + bindableProp-prop + (const QString &s) + + + void + setBoolProp + testqdoc-testderived.html + boolProp-prop + (bool b) + void staticObsoleteMember @@ -291,6 +368,20 @@ virtualFun () override + + const QString * + name + testqdoc-testderived.html + name-prop + () const const + + + void + invokeMe + testqdoc-testderived.html + invokeMe + () const const + DerivedType testqdoc-testderived.html @@ -303,6 +394,40 @@ NotTypedef-typedef + + bindableProp + testqdoc-testderived.html + bindableProp-prop + + + + boolProp + testqdoc-testderived.html + boolProp-prop + + + + intProp + testqdoc-testderived.html + intProp-prop + + + + name + testqdoc-testderived.html + name-prop + + + + someProp + testqdoc-testderived.html + someProp-prop + + + + + TheModule.TheType + qml-themodule-thetype.html QDoc.Test.Type diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/themodule-qmlmodule.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/themodule-qmlmodule.html new file mode 100644 index 000000000..e3d28561d --- /dev/null +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/themodule-qmlmodule.html @@ -0,0 +1,18 @@ + + + + + + Test 6.2.11 + + +
      + +
      +
      + +
      + +

      TheType

      + + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/test.index b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/test.index index 5c76473f3..210262454 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/test.index +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/test.index @@ -80,6 +80,7 @@ + @@ -133,13 +134,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -179,6 +220,7 @@ + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testqdoc-testderived.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testqdoc-testderived.webxml index 3752e9950..197cacd1d 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testqdoc-testderived.webxml +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testqdoc-testderived.webxml @@ -5,6 +5,59 @@ A class in a namespace, derived from Test. + + + setBindableProp() + + + + + + + + setBoolProp() + + + + + + + + Emitted when things happen. + + + + + + + + + + + Something invokable. + + + + + + + + + + + + bindableProp() + + + + + + boolProp() + + + + + Returns a value using an aliases type. @@ -28,6 +81,44 @@ I'm an alias, not a typedef. + + + + + + Some property. + + someProp + + + + + + + + + + A boolean property. + + + + + + An integer property. + + + + + + This property holds a name.. + + + + + + Another property. + + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testqdoc.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testqdoc.webxml index cbb10b291..ba3a26373 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testqdoc.webxml +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testqdoc.webxml @@ -133,6 +133,59 @@ A class in a namespace, derived from Test. + + + setBindableProp() + + + + + + + + setBoolProp() + + + + + + + + Emitted when things happen. + + + + + + + + + + + Something invokable. + + + + + + + + + + + + bindableProp() + + + + + + boolProp() + + + + + Returns a value using an aliases type. @@ -156,6 +209,44 @@ I'm an alias, not a typedef. + + + + + + Some property. + + someProp + + + + + + + + + + A boolean property. + + + + + + An integer property. + + + + + + This property holds a name.. + + + + + + Another property. + + diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testtagfile.tags b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testtagfile.tags index 43c31fe85..f68dffed6 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testtagfile.tags +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/testtagfile.tags @@ -270,6 +270,13 @@ TestQDoc::TestDerived testqdoc-testderived.html Test + + QBindable<QString> + bindableProp + testqdoc-testderived.html + bindableProp-prop + () + TestQDoc::TestDerived::NotTypedef someValue @@ -277,6 +284,76 @@ someValue () + + bool + boolProp + testqdoc-testderived.html + boolProp-prop + () + + + const QString & + someProp + testqdoc-testderived.html + someProp-prop + () + + + int * + getInt + testqdoc-testderived.html + intProp-prop + () + + + virtual int + id + testqdoc-testderived.html + id + () override + + + void + bindablePropChanged + testqdoc-testderived.html + bindableProp-prop + () + + + void + boolPropChanged + testqdoc-testderived.html + boolProp-prop + () + + + void + emitSomething + testqdoc-testderived.html + emitSomething + () + + + void + resetBoolProp + testqdoc-testderived.html + boolProp-prop + () + + + void + setBindableProp + testqdoc-testderived.html + bindableProp-prop + (const QString &s) + + + void + setBoolProp + testqdoc-testderived.html + boolProp-prop + (bool b) + void staticObsoleteMember @@ -291,6 +368,20 @@ virtualFun () override + + const QString * + name + testqdoc-testderived.html + name-prop + () const const + + + void + invokeMe + testqdoc-testderived.html + invokeMe + () const const + DerivedType testqdoc-testderived.html @@ -303,6 +394,40 @@ NotTypedef-typedef + + bindableProp + testqdoc-testderived.html + bindableProp-prop + + + + boolProp + testqdoc-testderived.html + boolProp-prop + + + + intProp + testqdoc-testderived.html + intProp-prop + + + + name + testqdoc-testderived.html + name-prop + + + + someProp + testqdoc-testderived.html + someProp-prop + + +       + + TheModule.TheType + qml-themodule-thetype.html QDoc.Test.Type diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/themodule-qmlmodule.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/themodule-qmlmodule.webxml new file mode 100644 index 000000000..5d24b3077 --- /dev/null +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/webxml/themodule-qmlmodule.webxml @@ -0,0 +1,4 @@ + + + + -- cgit v1.2.3