From 431a1709d728719662809a49ad98718c49cd6415 Mon Sep 17 00:00:00 2001 From: Alexei Cazacov Date: Fri, 11 Jul 2025 15:23:32 +0300 Subject: [PATCH] Doc: Remove the old sidebar configuration file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit removes the old-style sidebar config. Pick-to: 6.10 6.9 Change-Id: I8f817fad58fbe0bc44afbe15177631ea61589fe5 Reviewed-by: Kai Köhne --- REUSE.toml | 2 +- doc/config/qtdoc.qdocconf | 3 +- doc/config/style/qt5-sidebar.html | 190 ------------------------------ licenseRule.json | 3 +- 4 files changed, 3 insertions(+), 195 deletions(-) delete mode 100644 doc/config/style/qt5-sidebar.html diff --git a/REUSE.toml b/REUSE.toml index c89bed27f..9319fe243 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -37,7 +37,7 @@ SPDX-FileCopyrightText = "Copyright (C) The Qt Company Ltd." SPDX-License-Identifier = "Apache-2.0" [[annotations]] -path = ["**/README*", "**.qdocconf", "doc/config/style/qt5-sidebar.html", "doc/config/style/tree_config.xml", "**.qdocinc", +path = ["**/README*", "**.qdocconf", "doc/config/style/tree_config.xml", "**.qdocinc", "doc**/images/**"] comment = "documentation" precedence = "closest" diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf index c71ae2b8e..e9b4a7d3e 100644 --- a/doc/config/qtdoc.qdocconf +++ b/doc/config/qtdoc.qdocconf @@ -65,8 +65,7 @@ qhp.QtDoc.subprojects.examples.sortPages = true images/xNIz78IPBu0.jpg # Add an .html file with sidebar content, used in the online style -HTML.stylesheets += style/qt5-sidebar.html \ - style/tree_config.xml +HTML.stylesheets += style/tree_config.xml macro.indextitle = "\\title Qt $QT_VER" macro.qtver = "$QT_VER" diff --git a/doc/config/style/qt5-sidebar.html b/doc/config/style/qt5-sidebar.html deleted file mode 100644 index 252119243..000000000 --- a/doc/config/style/qt5-sidebar.html +++ /dev/null @@ -1,190 +0,0 @@ -
-
-

Reference

-
-
- - -
-
-
-
-

Overview

-
- -
-
-
-

Getting Started

-
- -
-
-
-

Development Tools

-
- -
-
-
-

Qt Fundamentals

-
- -
-
-
-

Building UIs with Qt Quick

-
- -
-
-
-

Building UIs with Qt Widgets

-
- -
-
-
-

Data Input Output

-
- -
-
-
-

Network and Connectivity

-
- -
-
-
-

Graphics and Printing

-
- -
-
-
-

Mobile Development

-
- -
diff --git a/licenseRule.json b/licenseRule.json index 82b90b72f..b8e5b6f5b 100644 --- a/licenseRule.json +++ b/licenseRule.json @@ -66,8 +66,7 @@ { "comment": "Files with the following endings are Documentation licensed.", "file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", ".qdoc.sample", "README.md", - "README", "qt_attribution.json", "tree_config.xml", - "doc/config/style/qt5-sidebar.html"], + "README", "qt_attribution.json", "tree_config.xml"], "location":{ "": { "comment": "",