doc: ensure that qmllint warning pages are at right URL

Extend the qmllintwarningcategory macro to ensure that `\page` contains
the logging category name. This way, qmllint can link to the doc pages
for the categories without causing 404 errors on the pages whose url is
different than the category name (for example due to an extra or missing
s at the end).

Change-Id: Id0198cad20cb697701c920f1f12a21ce55b8cc9c
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>

72 files changed, 2 insertions, 72 deletions

diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf
index 6184ddd7d8..ec366cc75e 100644
--- a/src/qml/doc/qtqml.qdocconf
+++ b/src/qml/doc/qtqml.qdocconf
@@ -92,4 +92,5 @@ spurious += "C\\+\\+ class .*\\\\instantiates .*"
 # Enforce zero documentation warnings
 warninglimit = 0
 
-macro.qmllintwarningcategory = "This warning category is spelled \\c{[\1]} by qmllint."
+macro.qmllintwarningcategory = "\\page qmllint-warnings-and-errors-\1.html\n" \
+                               "This warning category is spelled \\c{[\1]} by qmllint."
diff --git a/src/qml/doc/src/qmllint/access-singleton-via-object.qdoc b/src/qml/doc/src/qmllint/access-singleton-via-object.qdoc
index b74dc45ad2..22b35eab1e 100644
--- a/src/qml/doc/src/qmllint/access-singleton-via-object.qdoc
+++ b/src/qml/doc/src/qmllint/access-singleton-via-object.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-access-singleton-via-object.html
 \ingroup qmllint-warnings-and-errors
 
 \title Cannot access singleton as a property of an object
diff --git a/src/qml/doc/src/qmllint/alias-cycle.qdoc b/src/qml/doc/src/qmllint/alias-cycle.qdoc
index d73f567ceb..6a0ef43a5a 100644
--- a/src/qml/doc/src/qmllint/alias-cycle.qdoc
+++ b/src/qml/doc/src/qmllint/alias-cycle.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-alias-cycle.html
 \ingroup qmllint-warnings-and-errors
 
 \title Alias cycle
diff --git a/src/qml/doc/src/qmllint/attached-property-reuse.qdoc b/src/qml/doc/src/qmllint/attached-property-reuse.qdoc
index 6d6a948a60..f70d1d71ec 100644
--- a/src/qml/doc/src/qmllint/attached-property-reuse.qdoc
+++ b/src/qml/doc/src/qmllint/attached-property-reuse.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-attached-property-reuse.html
 \ingroup qmllint-warnings-and-errors
 
 \title Attached property reuse
diff --git a/src/qml/doc/src/qmllint/comma.qdoc b/src/qml/doc/src/qmllint/comma.qdoc
index 8ececd293b..4cd4d0cd10 100644
--- a/src/qml/doc/src/qmllint/comma.qdoc
+++ b/src/qml/doc/src/qmllint/comma.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-comma.html
 \ingroup qmllint-warnings-and-errors
 
 \title Comma
diff --git a/src/qml/doc/src/qmllint/compiler.qdoc b/src/qml/doc/src/qmllint/compiler.qdoc
index db6ee90f85..7384b2cc2c 100644
--- a/src/qml/doc/src/qmllint/compiler.qdoc
+++ b/src/qml/doc/src/qmllint/compiler.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-compiler.html
 \ingroup qmllint-warnings-and-errors
 
 \title compiler
diff --git a/src/qml/doc/src/qmllint/component-children-count.qdoc b/src/qml/doc/src/qmllint/component-children-count.qdoc
index ddba177670..f863d9f4cf 100644
--- a/src/qml/doc/src/qmllint/component-children-count.qdoc
+++ b/src/qml/doc/src/qmllint/component-children-count.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-component-children-count.html
 \ingroup qmllint-warnings-and-errors
 
 \title Components must have exactly one child
diff --git a/src/qml/doc/src/qmllint/confusing-expression-statement.qdoc b/src/qml/doc/src/qmllint/confusing-expression-statement.qdoc
index 0f5fe18486..15a048daa9 100644
--- a/src/qml/doc/src/qmllint/confusing-expression-statement.qdoc
+++ b/src/qml/doc/src/qmllint/confusing-expression-statement.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-confusing-expression-statement.html
 \ingroup qmllint-warnings-and-errors
 
 \title Confusing expression statement
diff --git a/src/qml/doc/src/qmllint/confusing-minuses.qdoc b/src/qml/doc/src/qmllint/confusing-minuses.qdoc
index 55f1567274..8019c6f8fb 100644
--- a/src/qml/doc/src/qmllint/confusing-minuses.qdoc
+++ b/src/qml/doc/src/qmllint/confusing-minuses.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-confusing-minuses.html
 \ingroup qmllint-warnings-and-errors
 
 \title Confusing minuses
diff --git a/src/qml/doc/src/qmllint/confusing-pluses.qdoc b/src/qml/doc/src/qmllint/confusing-pluses.qdoc
index d78ec4b500..7090bf904a 100644
--- a/src/qml/doc/src/qmllint/confusing-pluses.qdoc
+++ b/src/qml/doc/src/qmllint/confusing-pluses.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-confusing-pluses.html
 \ingroup qmllint-warnings-and-errors
 
 \title Confusing pluses
diff --git a/src/qml/doc/src/qmllint/context-properties.qdoc b/src/qml/doc/src/qmllint/context-properties.qdoc
index 3bf9f6073f..7727c4fcde 100644
--- a/src/qml/doc/src/qmllint/context-properties.qdoc
+++ b/src/qml/doc/src/qmllint/context-properties.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-context-properties.html
 \ingroup qmllint-warnings-and-errors
 
 \title Context properties
diff --git a/src/qml/doc/src/qmllint/deferred-property-id.qdoc b/src/qml/doc/src/qmllint/deferred-property-id.qdoc
index 157f8227e2..d444610cd9 100644
--- a/src/qml/doc/src/qmllint/deferred-property-id.qdoc
+++ b/src/qml/doc/src/qmllint/deferred-property-id.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-deferred-property-id.html
 \ingroup qmllint-warnings-and-errors
 
 \title deferred-property-id
diff --git a/src/qml/doc/src/qmllint/deprecated.qdoc b/src/qml/doc/src/qmllint/deprecated.qdoc
index 17247861fe..e77642d220 100644
--- a/src/qml/doc/src/qmllint/deprecated.qdoc
+++ b/src/qml/doc/src/qmllint/deprecated.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-deprecated.html
 \ingroup qmllint-warnings-and-errors
 
 \title Deprecated
diff --git a/src/qml/doc/src/qmllint/duplicate-enum-entries.qdoc b/src/qml/doc/src/qmllint/duplicate-enum-entries.qdoc
index d315dca240..4d0828c6ae 100644
--- a/src/qml/doc/src/qmllint/duplicate-enum-entries.qdoc
+++ b/src/qml/doc/src/qmllint/duplicate-enum-entries.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-duplicate-enum-entries.html
 \ingroup qmllint-warnings-and-errors
 
 \title Duplicate enum entries
diff --git a/src/qml/doc/src/qmllint/duplicate-import.qdoc b/src/qml/doc/src/qmllint/duplicate-import.qdoc
index 43d4116650..4303f05d98 100644
--- a/src/qml/doc/src/qmllint/duplicate-import.qdoc
+++ b/src/qml/doc/src/qmllint/duplicate-import.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-duplicate-import.html
 \ingroup qmllint-warnings-and-errors
 
 \title Duplicate Imports
diff --git a/src/qml/doc/src/qmllint/duplicate-inline-components.qdoc b/src/qml/doc/src/qmllint/duplicate-inline-components.qdoc
index db9145cedd..63df31ff69 100644
--- a/src/qml/doc/src/qmllint/duplicate-inline-components.qdoc
+++ b/src/qml/doc/src/qmllint/duplicate-inline-components.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-duplicate-inline-components.html
 \ingroup qmllint-warnings-and-errors
 
 \title Duplicate inline components
diff --git a/src/qml/doc/src/qmllint/duplicate-property-binding.qdoc b/src/qml/doc/src/qmllint/duplicate-property-binding.qdoc
index 57501bf095..ce128a4755 100644
--- a/src/qml/doc/src/qmllint/duplicate-property-binding.qdoc
+++ b/src/qml/doc/src/qmllint/duplicate-property-binding.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-duplicate-property-binding.html
 \ingroup qmllint-warnings-and-errors
 
 \title Duplicate bindings
diff --git a/src/qml/doc/src/qmllint/duplicated-name.qdoc b/src/qml/doc/src/qmllint/duplicated-name.qdoc
index 5bbc7c9fa7..d7226410ee 100644
--- a/src/qml/doc/src/qmllint/duplicated-name.qdoc
+++ b/src/qml/doc/src/qmllint/duplicated-name.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-duplicated-name.html
 \ingroup qmllint-warnings-and-errors
 
 \title Duplicated name
diff --git a/src/qml/doc/src/qmllint/enum-entry-matches-enum.qdoc b/src/qml/doc/src/qmllint/enum-entry-matches-enum.qdoc
index b208dab085..9593db90ee 100644
--- a/src/qml/doc/src/qmllint/enum-entry-matches-enum.qdoc
+++ b/src/qml/doc/src/qmllint/enum-entry-matches-enum.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-enum-entry-matches-enum.html
 \ingroup qmllint-warnings-and-errors
 
 \title Enum entry matches enum
diff --git a/src/qml/doc/src/qmllint/enum-key-case.qdoc b/src/qml/doc/src/qmllint/enum-key-case.qdoc
index 53c8bfcef6..1812860e6a 100644
--- a/src/qml/doc/src/qmllint/enum-key-case.qdoc
+++ b/src/qml/doc/src/qmllint/enum-key-case.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-enum-key-case.html
 \ingroup qmllint-warnings-and-errors
 
 \title Enum key case
diff --git a/src/qml/doc/src/qmllint/enums-are-not-types.qdoc b/src/qml/doc/src/qmllint/enums-are-not-types.qdoc
index 824f9790e3..4fdd0c7424 100644
--- a/src/qml/doc/src/qmllint/enums-are-not-types.qdoc
+++ b/src/qml/doc/src/qmllint/enums-are-not-types.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-enums-are-not-types.html
 \ingroup qmllint-warnings-and-errors
 
 \title Enums are not types
diff --git a/src/qml/doc/src/qmllint/equality-type-coercion.qdoc b/src/qml/doc/src/qmllint/equality-type-coercion.qdoc
index e171415f23..87c7e2a998 100644
--- a/src/qml/doc/src/qmllint/equality-type-coercion.qdoc
+++ b/src/qml/doc/src/qmllint/equality-type-coercion.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-equality-type-coercion.html
 \ingroup qmllint-warnings-and-errors
 
 \title Loose equality comparison type coercion
diff --git a/src/qml/doc/src/qmllint/eval.qdoc b/src/qml/doc/src/qmllint/eval.qdoc
index 7e9559b30a..881f59598d 100644
--- a/src/qml/doc/src/qmllint/eval.qdoc
+++ b/src/qml/doc/src/qmllint/eval.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-eval.html
 \ingroup qmllint-warnings-and-errors
 
 \title Eval
diff --git a/src/qml/doc/src/qmllint/function-used-before-declaration.qdoc b/src/qml/doc/src/qmllint/function-used-before-declaration.qdoc
index 4313f77bd4..2c96b9c4f5 100644
--- a/src/qml/doc/src/qmllint/function-used-before-declaration.qdoc
+++ b/src/qml/doc/src/qmllint/function-used-before-declaration.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-function-used-before-declaration.html
 \ingroup qmllint-warnings-and-errors
 
 \title Function used before its declaration
diff --git a/src/qml/doc/src/qmllint/id-shadows-member.qdoc b/src/qml/doc/src/qmllint/id-shadows-member.qdoc
index 7a5967b76b..375a0f9b78 100644
--- a/src/qml/doc/src/qmllint/id-shadows-member.qdoc
+++ b/src/qml/doc/src/qmllint/id-shadows-member.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-id-shadows-member.html
 \ingroup qmllint-warnings-and-errors
 
 \title Id shadows member
diff --git a/src/qml/doc/src/qmllint/import-file-selector.qdoc b/src/qml/doc/src/qmllint/import-file-selector.qdoc
index afa3758f1f..d06fa555ab 100644
--- a/src/qml/doc/src/qmllint/import-file-selector.qdoc
+++ b/src/qml/doc/src/qmllint/import-file-selector.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-import-file-selector.html
 \ingroup qmllint-warnings-and-errors
 
 \title Import file selector
diff --git a/src/qml/doc/src/qmllint/import.qdoc b/src/qml/doc/src/qmllint/import.qdoc
index 9184887a99..eb7047317c 100644
--- a/src/qml/doc/src/qmllint/import.qdoc
+++ b/src/qml/doc/src/qmllint/import.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-import.html
 \ingroup qmllint-warnings-and-errors
 
 \title Warnings occurred while importing
diff --git a/src/qml/doc/src/qmllint/incompatible-type.qdoc b/src/qml/doc/src/qmllint/incompatible-type.qdoc
index 23139461c5..5684c9cceb 100644
--- a/src/qml/doc/src/qmllint/incompatible-type.qdoc
+++ b/src/qml/doc/src/qmllint/incompatible-type.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-incompatible-type.html
 \ingroup qmllint-warnings-and-errors
 
 \title Incompatible type
diff --git a/src/qml/doc/src/qmllint/inheritance-cycle.qdoc b/src/qml/doc/src/qmllint/inheritance-cycle.qdoc
index 59630c7828..ea5995bf58 100644
--- a/src/qml/doc/src/qmllint/inheritance-cycle.qdoc
+++ b/src/qml/doc/src/qmllint/inheritance-cycle.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-inheritance-cycle.html
 \ingroup qmllint-warnings-and-errors
 
 \title Inheritance cycle
diff --git a/src/qml/doc/src/qmllint/inline-component-enums.qdoc b/src/qml/doc/src/qmllint/inline-component-enums.qdoc
index 14352a6b87..727749f358 100644
--- a/src/qml/doc/src/qmllint/inline-component-enums.qdoc
+++ b/src/qml/doc/src/qmllint/inline-component-enums.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-inline-component-enums.html
 \ingroup qmllint-warnings-and-errors
 
 \title Inline component enums
diff --git a/src/qml/doc/src/qmllint/invalid-lint-directive.qdoc b/src/qml/doc/src/qmllint/invalid-lint-directive.qdoc
index 57ff98e54a..78338910f1 100644
--- a/src/qml/doc/src/qmllint/invalid-lint-directive.qdoc
+++ b/src/qml/doc/src/qmllint/invalid-lint-directive.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-invalid-lint-directive.html
 \ingroup qmllint-warnings-and-errors
 
 \title Invalid qmllint directives
diff --git a/src/qml/doc/src/qmllint/literal-constructor.qdoc b/src/qml/doc/src/qmllint/literal-constructor.qdoc
index fa1b71b18a..eba565e661 100644
--- a/src/qml/doc/src/qmllint/literal-constructor.qdoc
+++ b/src/qml/doc/src/qmllint/literal-constructor.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-literal-constructor.html
 \ingroup qmllint-warnings-and-errors
 
 \title Literal constructor
diff --git a/src/qml/doc/src/qmllint/max-warnings-exceeded.qdoc b/src/qml/doc/src/qmllint/max-warnings-exceeded.qdoc
index 8dd389a0b5..703c1c2098 100644
--- a/src/qml/doc/src/qmllint/max-warnings-exceeded.qdoc
+++ b/src/qml/doc/src/qmllint/max-warnings-exceeded.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-max-warnings-exceeded.html
 \ingroup qmllint-warnings-and-errors
 
 \title Max warnings exceeded
diff --git a/src/qml/doc/src/qmllint/missing-enum-entry.qdoc b/src/qml/doc/src/qmllint/missing-enum-entry.qdoc
index 325f0d4568..1ed2de2412 100644
--- a/src/qml/doc/src/qmllint/missing-enum-entry.qdoc
+++ b/src/qml/doc/src/qmllint/missing-enum-entry.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-missing-enum-entry.html
 \ingroup qmllint-warnings-and-errors
 
 \title Missing enum entry
diff --git a/src/qml/doc/src/qmllint/missing-property.qdoc b/src/qml/doc/src/qmllint/missing-property.qdoc
index baaf540570..3ac98c89a4 100644
--- a/src/qml/doc/src/qmllint/missing-property.qdoc
+++ b/src/qml/doc/src/qmllint/missing-property.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-missing-property.html
 \ingroup qmllint-warnings-and-errors
 
 \title Missing property
diff --git a/src/qml/doc/src/qmllint/missing-type.qdoc b/src/qml/doc/src/qmllint/missing-type.qdoc
index 6f086afde1..17e1091439 100644
--- a/src/qml/doc/src/qmllint/missing-type.qdoc
+++ b/src/qml/doc/src/qmllint/missing-type.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-missing-type.html
 \ingroup qmllint-warnings-and-errors
 
 \title Missing type
diff --git a/src/qml/doc/src/qmllint/multiline-strings.qdoc b/src/qml/doc/src/qmllint/multiline-strings.qdoc
index 711b1a11ed..ac8f00b09f 100644
--- a/src/qml/doc/src/qmllint/multiline-strings.qdoc
+++ b/src/qml/doc/src/qmllint/multiline-strings.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-multiline-strings.html
 \ingroup qmllint-warnings-and-errors
 
 \title Multiline strings
diff --git a/src/qml/doc/src/qmllint/non-list-property.qdoc b/src/qml/doc/src/qmllint/non-list-property.qdoc
index 2cac3c7100..076a0a5a49 100644
--- a/src/qml/doc/src/qmllint/non-list-property.qdoc
+++ b/src/qml/doc/src/qmllint/non-list-property.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-non-list-property.html
 \ingroup qmllint-warnings-and-errors
 
 \title Non-list property
diff --git a/src/qml/doc/src/qmllint/non-root-enum.qdoc b/src/qml/doc/src/qmllint/non-root-enum.qdoc
index e8315e72d9..11b3d05204 100644
--- a/src/qml/doc/src/qmllint/non-root-enum.qdoc
+++ b/src/qml/doc/src/qmllint/non-root-enum.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-non-root-enum.html
 \ingroup qmllint-warnings-and-errors
 
 \title Enum declared outside the root element
diff --git a/src/qml/doc/src/qmllint/prefer-non-var-properties.qdoc b/src/qml/doc/src/qmllint/prefer-non-var-properties.qdoc
index 5cab39b943..cb8acd2c6c 100644
--- a/src/qml/doc/src/qmllint/prefer-non-var-properties.qdoc
+++ b/src/qml/doc/src/qmllint/prefer-non-var-properties.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-prefer-non-var-properties.html
 \ingroup qmllint-warnings-and-errors
 
 \title Prefer non-var properties
diff --git a/src/qml/doc/src/qmllint/prefixed-import-type.qdoc b/src/qml/doc/src/qmllint/prefixed-import-type.qdoc
index 481cac6aaa..b613060f5f 100644
--- a/src/qml/doc/src/qmllint/prefixed-import-type.qdoc
+++ b/src/qml/doc/src/qmllint/prefixed-import-type.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-prefixed-import-type.html
 \ingroup qmllint-warnings-and-errors
 
 \title prefixed-import-type
diff --git a/src/qml/doc/src/qmllint/property-override.qdoc b/src/qml/doc/src/qmllint/property-override.qdoc
index 1813c5c1ec..b734f28de2 100644
--- a/src/qml/doc/src/qmllint/property-override.qdoc
+++ b/src/qml/doc/src/qmllint/property-override.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-property-override.html
 \ingroup qmllint-warnings-and-errors
 
 \title Property override
diff --git a/src/qml/doc/src/qmllint/quick/attached-property-type.qdoc b/src/qml/doc/src/qmllint/quick/attached-property-type.qdoc
index 090d27d9d2..fd1afdb976 100644
--- a/src/qml/doc/src/qmllint/quick/attached-property-type.qdoc
+++ b/src/qml/doc/src/qmllint/quick/attached-property-type.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-quick-attached-property-type.html
 \ingroup qmllint-warnings-and-errors
 
 \title Quick: Attached property type
diff --git a/src/qml/doc/src/qmllint/read-only-property.qdoc b/src/qml/doc/src/qmllint/read-only-property.qdoc
index 78546c3942..fc29361310 100644
--- a/src/qml/doc/src/qmllint/read-only-property.qdoc
+++ b/src/qml/doc/src/qmllint/read-only-property.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-read-only-property.html
 \ingroup qmllint-warnings-and-errors
 
 \title Readonly property
diff --git a/src/qml/doc/src/qmllint/recursion-depth-errors.qdoc b/src/qml/doc/src/qmllint/recursion-depth-errors.qdoc
index 517e061350..dc5be99b18 100644
--- a/src/qml/doc/src/qmllint/recursion-depth-errors.qdoc
+++ b/src/qml/doc/src/qmllint/recursion-depth-errors.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-recursion-depth-errors.html
 \ingroup qmllint-warnings-and-errors
 
 \title Recursion depths errors
diff --git a/src/qml/doc/src/qmllint/redundantOptionalChaining.qdoc b/src/qml/doc/src/qmllint/redundantOptionalChaining.qdoc
index 20f28b48e0..4f8c6a06e0 100644
--- a/src/qml/doc/src/qmllint/redundantOptionalChaining.qdoc
+++ b/src/qml/doc/src/qmllint/redundantOptionalChaining.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-redundant-optional-chaining.html
 \ingroup qmllint-warnings-and-errors
 
 \title Redundant Optional Chaining
diff --git a/src/qml/doc/src/qmllint/renamed-type.qdoc b/src/qml/doc/src/qmllint/renamed-type.qdoc
index 94f714b0ad..e1a860d37d 100644
--- a/src/qml/doc/src/qmllint/renamed-type.qdoc
+++ b/src/qml/doc/src/qmllint/renamed-type.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-renamed-type.html
 \ingroup qmllint-warnings-and-errors
 
 \title Renamed Type
diff --git a/src/qml/doc/src/qmllint/required.qdoc b/src/qml/doc/src/qmllint/required.qdoc
index 63e36c1b43..511ddc57ef 100644
--- a/src/qml/doc/src/qmllint/required.qdoc
+++ b/src/qml/doc/src/qmllint/required.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-required.html
 \ingroup qmllint-warnings-and-errors
 
 \title Component is missing a required property
diff --git a/src/qml/doc/src/qmllint/restricted-type.qdoc b/src/qml/doc/src/qmllint/restricted-type.qdoc
index d2001bf255..4f21b578be 100644
--- a/src/qml/doc/src/qmllint/restricted-type.qdoc
+++ b/src/qml/doc/src/qmllint/restricted-type.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-restricted-type.html
 \ingroup qmllint-warnings-and-errors
 
 \title Restricted type
diff --git a/src/qml/doc/src/qmllint/shadow.qdoc b/src/qml/doc/src/qmllint/shadow.qdoc
index 3ddd52c20c..18bf6c62d3 100644
--- a/src/qml/doc/src/qmllint/shadow.qdoc
+++ b/src/qml/doc/src/qmllint/shadow.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-shadow.html
 \ingroup qmllint-warnings-and-errors
 
 \title Shadow
diff --git a/src/qml/doc/src/qmllint/signal-handler-name-clash.qdoc b/src/qml/doc/src/qmllint/signal-handler-name-clash.qdoc
index 4960007e9a..edc90ac88d 100644
--- a/src/qml/doc/src/qmllint/signal-handler-name-clash.qdoc
+++ b/src/qml/doc/src/qmllint/signal-handler-name-clash.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-signal-handler-name-clash.html
 \ingroup qmllint-warnings-and-errors
 
 \title Signal handler name clash
diff --git a/src/qml/doc/src/qmllint/signal-handler-parameters.qdoc b/src/qml/doc/src/qmllint/signal-handler-parameters.qdoc
index 7daf61ce4e..5358313aaa 100644
--- a/src/qml/doc/src/qmllint/signal-handler-parameters.qdoc
+++ b/src/qml/doc/src/qmllint/signal-handler-parameters.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-signal-handler-parameters.html
 \ingroup qmllint-warnings-and-errors
 
 \title Signal handler parameters
diff --git a/src/qml/doc/src/qmllint/stale-property-read.qdoc b/src/qml/doc/src/qmllint/stale-property-read.qdoc
index 31923596b4..b566f39e77 100644
--- a/src/qml/doc/src/qmllint/stale-property-read.qdoc
+++ b/src/qml/doc/src/qmllint/stale-property-read.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-stale-property-read.html
 \ingroup qmllint-warnings-and-errors
 
 \title Stale property read
diff --git a/src/qml/doc/src/qmllint/syntax.duplicate-ids.qdoc b/src/qml/doc/src/qmllint/syntax.duplicate-ids.qdoc
index 026f306c6b..c883661abf 100644
--- a/src/qml/doc/src/qmllint/syntax.duplicate-ids.qdoc
+++ b/src/qml/doc/src/qmllint/syntax.duplicate-ids.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-syntax.duplicate-ids.html
 \ingroup qmllint-warnings-and-errors
 
 \title Duplicate id
diff --git a/src/qml/doc/src/qmllint/syntax.id-quotation.qdoc b/src/qml/doc/src/qmllint/syntax.id-quotation.qdoc
index 4a45b61e23..620952132c 100644
--- a/src/qml/doc/src/qmllint/syntax.id-quotation.qdoc
+++ b/src/qml/doc/src/qmllint/syntax.id-quotation.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-syntax.id-quotation.html
 \ingroup qmllint-warnings-and-errors
 
 \title Id quotation
diff --git a/src/qml/doc/src/qmllint/syntax.qdoc b/src/qml/doc/src/qmllint/syntax.qdoc
index a4485ec043..90128061d4 100644
--- a/src/qml/doc/src/qmllint/syntax.qdoc
+++ b/src/qml/doc/src/qmllint/syntax.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-syntax.html
 \ingroup qmllint-warnings-and-errors
 
 \title Syntax
diff --git a/src/qml/doc/src/qmllint/top-level-component.qdoc b/src/qml/doc/src/qmllint/top-level-component.qdoc
index 0916fe9231..aa999efcf4 100644
--- a/src/qml/doc/src/qmllint/top-level-component.qdoc
+++ b/src/qml/doc/src/qmllint/top-level-component.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-top-level-component.html
 \ingroup qmllint-warnings-and-errors
 
 \title Top level component
diff --git a/src/qml/doc/src/qmllint/type-instantiated-recursively.qdoc b/src/qml/doc/src/qmllint/type-instantiated-recursively.qdoc
index eda18d2c3c..d41506851c 100644
--- a/src/qml/doc/src/qmllint/type-instantiated-recursively.qdoc
+++ b/src/qml/doc/src/qmllint/type-instantiated-recursively.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-type-instantiated-recursively.html
 \ingroup qmllint-warnings-and-errors
 
 \title Type is instantiated recursively
diff --git a/src/qml/doc/src/qmllint/uncreatable-type.qdoc b/src/qml/doc/src/qmllint/uncreatable-type.qdoc
index 31fd396753..5c82a8b919 100644
--- a/src/qml/doc/src/qmllint/uncreatable-type.qdoc
+++ b/src/qml/doc/src/qmllint/uncreatable-type.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-uncreatable-type.html
 \ingroup qmllint-warnings-and-errors
 
 \title Uncreatable type
diff --git a/src/qml/doc/src/qmllint/unintentional-empty-block.qdoc b/src/qml/doc/src/qmllint/unintentional-empty-block.qdoc
index c3a1d83d62..df6721f0ea 100644
--- a/src/qml/doc/src/qmllint/unintentional-empty-block.qdoc
+++ b/src/qml/doc/src/qmllint/unintentional-empty-block.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-unintentional-empty-block.html
 \ingroup qmllint-warnings-and-errors
 
 \title Unintentional empty block
diff --git a/src/qml/doc/src/qmllint/unqualified.qdoc b/src/qml/doc/src/qmllint/unqualified.qdoc
index 9e82a62ddc..23a98cbaf2 100644
--- a/src/qml/doc/src/qmllint/unqualified.qdoc
+++ b/src/qml/doc/src/qmllint/unqualified.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-unqualified.html
 \ingroup qmllint-warnings-and-errors
 
 \title Unqualified
diff --git a/src/qml/doc/src/qmllint/unreachable-code.qdoc b/src/qml/doc/src/qmllint/unreachable-code.qdoc
index 99fd4255d2..a4477d7146 100644
--- a/src/qml/doc/src/qmllint/unreachable-code.qdoc
+++ b/src/qml/doc/src/qmllint/unreachable-code.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-unreachable-code.html
 \ingroup qmllint-warnings-and-errors
 
 \title Unreachable code
diff --git a/src/qml/doc/src/qmllint/unresolved-alias.qdoc b/src/qml/doc/src/qmllint/unresolved-alias.qdoc
index 561651d83e..09fde3604f 100644
--- a/src/qml/doc/src/qmllint/unresolved-alias.qdoc
+++ b/src/qml/doc/src/qmllint/unresolved-alias.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-unresolved-alias.html
 \ingroup qmllint-warnings-and-errors
 
 \title Unresolved alias
diff --git a/src/qml/doc/src/qmllint/unresolved-type.qdoc b/src/qml/doc/src/qmllint/unresolved-type.qdoc
index 4b7356856c..52187b718e 100644
--- a/src/qml/doc/src/qmllint/unresolved-type.qdoc
+++ b/src/qml/doc/src/qmllint/unresolved-type.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-unresolved-type.html
 \ingroup qmllint-warnings-and-errors
 
 \title Unresolved type
diff --git a/src/qml/doc/src/qmllint/unterminated-case.qdoc b/src/qml/doc/src/qmllint/unterminated-case.qdoc
index 8713f81510..e7ec8b0775 100644
--- a/src/qml/doc/src/qmllint/unterminated-case.qdoc
+++ b/src/qml/doc/src/qmllint/unterminated-case.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-unterminated-case.html
 \ingroup qmllint-warnings-and-errors
 
 \title Unterminated non-empty case block
diff --git a/src/qml/doc/src/qmllint/unused-imports.qdoc b/src/qml/doc/src/qmllint/unused-imports.qdoc
index e504ed0c84..7e899a7512 100644
--- a/src/qml/doc/src/qmllint/unused-imports.qdoc
+++ b/src/qml/doc/src/qmllint/unused-imports.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-unused-imports.html
 \ingroup qmllint-warnings-and-errors
 
 \title Unused imports
diff --git a/src/qml/doc/src/qmllint/use-proper-function.qdoc b/src/qml/doc/src/qmllint/use-proper-function.qdoc
index 257e8266e0..a8497d11e2 100644
--- a/src/qml/doc/src/qmllint/use-proper-function.qdoc
+++ b/src/qml/doc/src/qmllint/use-proper-function.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-use-proper-function.html
 \ingroup qmllint-warnings-and-errors
 
 \title Use proper function
diff --git a/src/qml/doc/src/qmllint/var-used-before-declaration.qdoc b/src/qml/doc/src/qmllint/var-used-before-declaration.qdoc
index b505b246d8..a9cb53f79a 100644
--- a/src/qml/doc/src/qmllint/var-used-before-declaration.qdoc
+++ b/src/qml/doc/src/qmllint/var-used-before-declaration.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-var-used-before-declaration.html
 \ingroup qmllint-warnings-and-errors
 
 \title Var used before declaration
diff --git a/src/qml/doc/src/qmllint/var-used-in-block-scope.qdoc b/src/qml/doc/src/qmllint/var-used-in-block-scope.qdoc
index 07f09aa055..7d32016123 100644
--- a/src/qml/doc/src/qmllint/var-used-in-block-scope.qdoc
+++ b/src/qml/doc/src/qmllint/var-used-in-block-scope.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-block-scope-var-declaration.html
 \ingroup qmllint-warnings-and-errors
 
 \title Block scope var declaration
diff --git a/src/qml/doc/src/qmllint/void.qdoc b/src/qml/doc/src/qmllint/void.qdoc
index cfcee3c472..7e0485f95a 100644
--- a/src/qml/doc/src/qmllint/void.qdoc
+++ b/src/qml/doc/src/qmllint/void.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-void.html
 \ingroup qmllint-warnings-and-errors
 
 \title Do not use void in expressions
diff --git a/src/qml/doc/src/qmllint/warn-assignment-in-condition.qdoc b/src/qml/doc/src/qmllint/warn-assignment-in-condition.qdoc
index 64fcfe697a..c70f6d9564 100644
--- a/src/qml/doc/src/qmllint/warn-assignment-in-condition.qdoc
+++ b/src/qml/doc/src/qmllint/warn-assignment-in-condition.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-assignment-in-condition.html
 \ingroup qmllint-warnings-and-errors
 
 \title Warn about using assignment in conditions
diff --git a/src/qml/doc/src/qmllint/with.qdoc b/src/qml/doc/src/qmllint/with.qdoc
index eed1788c96..ed1d32e5ee 100644
--- a/src/qml/doc/src/qmllint/with.qdoc
+++ b/src/qml/doc/src/qmllint/with.qdoc
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
-\page qmllint-warnings-and-errors-with.html
 \ingroup qmllint-warnings-and-errors
 
 \title With