diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html index 9fc4a6bc7b3..509808af114 100644 --- a/doc/qtcreator/config/style/qt5-sidebar.html +++ b/doc/qtcreator/config/style/qt5-sidebar.html @@ -5,13 +5,20 @@
-

Getting Started

+

Developing with Qt Creator

@@ -34,26 +41,6 @@ -
-
-

Running on Devices

-
- -
-
-
-

Debugging and Analyzing

-
- -

How To

diff --git a/doc/qtcreator/images/front-projects.png b/doc/qtcreator/images/front-projects.png deleted file mode 100644 index bd3412e8489..00000000000 Binary files a/doc/qtcreator/images/front-projects.png and /dev/null differ diff --git a/doc/qtcreator/images/front-publishing.png b/doc/qtcreator/images/front-publishing.png deleted file mode 100644 index 9946aa36cd3..00000000000 Binary files a/doc/qtcreator/images/front-publishing.png and /dev/null differ diff --git a/doc/qtcreator/images/front-testing.png b/doc/qtcreator/images/front-testing.png deleted file mode 100644 index 69b1fe45d56..00000000000 Binary files a/doc/qtcreator/images/front-testing.png and /dev/null differ diff --git a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc index 115e666d0b9..b1531ae6857 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc @@ -25,11 +25,11 @@ \li \inlineimage front-ui.png \li \inlineimage front-advanced.png \row - \li \b {\l{Overview}} + \li \b {\l{Developing with \QC}} If you have not used an integrated development environment (IDE) before, or want to know what kind of IDE \QC is, go to - \l{Overview}. + \l{Developing with \QC}. \li \b {\l{User Interface}} If you have not used \QC before, and want to become familiar diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc index 675b8884c69..b164224e848 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc @@ -8,11 +8,11 @@ // ********************************************************************** /*! - \previouspage creator-getting-started.html + \previouspage index.html \page creator-overview.html - \nextpage creator-quick-tour.html + \nextpage creator-getting-started.html - \title Overview + \title Developing with \QC \QC is a cross-platform, complete integrated development environment (IDE) that you can use to create applications for desktop, embedded, @@ -235,6 +235,11 @@ a suitable native debugger for each kit from the ones it finds on the computer. Edit the kits to override this choice. + If you install \QC with \QOI, the GNU Symbolic Debugger is installed + automatically and you should be ready to start debugging after you create + a new project. However, you can change the setup to use debugging tools for + Windows, for example. + Connect devices to your computer to debug processes running on the devices. For more information, see \l{Debugging}. diff --git a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc index 0a9240f7594..45432f561bd 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc @@ -4,7 +4,7 @@ /*! \page creator-reference.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \nextpage creator-acknowledgements.html \title Reference diff --git a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc deleted file mode 100644 index 34297d34fa5..00000000000 --- a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - -/*! - \previouspage creator-build-process-customizing.html - \page creator-testing.html - \nextpage creator-debugging.html - - \title Debugging and Analyzing - - \image front-testing.png - - \list - - \li \l{Debugging} - - If you install \QC with \QOI, the GNU Symbolic Debugger - is installed automatically and you should be ready to start - debugging after you create a new project. However, you can - change the setup to use debugging tools for Windows, for - example. You can connect \l{glossary-device}{devices} to your - development host and debug processes running on the devices. - - \li \l{Analyzing Code} - - Use tools for analyzing C++ and QML code to identify issues in - memory management, CPU usage, coding constructs, and so on. You - must install and configure the tools on your system to use them - from \QC. However, the QML Profiler is installed as part of \QC - for profiling Qt Quick applications. - - \li \l{Using Squish} - - Map AUTs to \QC and run Squish test suites and cases from it. - - \endlist - -*/ diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 52b28cf7e2b..0a60027451d 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -13,20 +13,15 @@ {Qt documentation} portal or in the \l {Get help}{Help} mode. \list - \li \l{Getting Started} - \list - \li \l{Overview} + \li \l{Developing with \QC} \list + \li \l{Getting Started} + \list + \li \l{User Interface} + \li \l{Configuring Qt Creator} + \endlist \li \l{Creating Projects} \li \l{Configuring Projects} - \endlist - \li \l{User Interface} - \li \l{Configuring Qt Creator} - \endlist - \li \l{Tutorials} - \generatelist creator-tutorials - \li \l{Running on Devices} - \list \li \l{Validating with Target Hardware} \list \li \l{Previewing on Desktop} @@ -52,9 +47,6 @@ \li \l{Connecting Remote Linux Devices} \li \l{Building Applications for the Web} \endlist - \endlist - \li \l{Debugging and Analyzing} - \list \li \l{Debugging} \list \li \l{Setting Up Debugger} @@ -97,6 +89,8 @@ \endlist \li \l{Using Squish} \endlist + \li \l{Tutorials} + \generatelist creator-tutorials \li \l{How To} \list \li Analyze diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc index 0fc9b31eeb6..cc3352dd108 100644 --- a/doc/qtcreator/src/qtcreator.qdoc +++ b/doc/qtcreator/src/qtcreator.qdoc @@ -9,7 +9,7 @@ /*! \page index.html - \nextpage creator-getting-started.html + \nextpage creator-overview.html \title Qt Creator Manual @@ -27,37 +27,27 @@ \table \row - \li {4,1} \b {\l{All Topics}{Click Here for a List of All Topics}} + \li {4,1} \b {\l{All Topics}} \row \li \inlineimage front-gs.png \li \inlineimage front-coding.png - \li \inlineimage front-preview.png - \row - \li \b {\l{Getting Started}} - \list - \li \l{Overview} - \li \l{User Interface} - \li \l{Configuring Qt Creator} - \endlist - \li \b {\l{Tutorials}} - \generatelist creator-tutorials - \li \b {\l{Running on Devices}} - \list - \li \l{Validating with Target Hardware} - \li \l{Deploying to Devices} - \li \l{Connecting Devices} - \endlist - \row - \li \inlineimage front-testing.png \li \inlineimage front-help.png \li \inlineimage front-advanced.png \row - \li \b {\l{Debugging and Analyzing}} + \li \b {\l{Developing with \QC}} \list + \li \l{Getting Started} + \li \l{Creating Projects} + \li \l{Configuring Projects} + \li \l{Validating with Target Hardware} + \li \l{Connecting Devices} + \li \l{Deploying to Devices} \li \l{Debugging} \li \l{Analyzing Code} \li \l{Using Squish} \endlist + \li \b {\l{Tutorials}} + \generatelist creator-tutorials \li \b {\l{How To}} \list \li \l{Analyze} @@ -70,7 +60,6 @@ \li \l{Test} \li \l{Use \QC} \li \l{Use the UI} - \li \l{How To}{See All} \endlist \li \b {\l{Reference}} \list @@ -83,7 +72,6 @@ \li \l {Supported Platforms} \li \l {Version Control Systems} \li \l {Views} - \li \l {Reference}{See All} \endlist \endtable */