diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/config.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 9 | ||||
| -rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 446 | ||||
| -rw-r--r-- | doc/global/html-footer-online.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/html-footer.qdocconf | 8 | ||||
| -rw-r--r-- | doc/global/includes/standardpath/functiondocs.qdocinc | 3 | ||||
| -rw-r--r-- | doc/global/qt-module-defaults-online.qdocconf | 8 | ||||
| -rw-r--r-- | doc/global/template/style/offline.css | 37 | ||||
| -rw-r--r-- | doc/global/template/style/online.css | 19 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_corelib_tools_qvector.cpp | 4 |
10 files changed, 293 insertions, 245 deletions
diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf index acfd5869ed..dab0890a98 100644 --- a/doc/global/config.qdocconf +++ b/doc/global/config.qdocconf @@ -3,7 +3,7 @@ dita.metadata.default.author = Qt Project dita.metadata.default.permissions = all dita.metadata.default.publisher = Qt Project -dita.metadata.default.copyryear = 2020 +dita.metadata.default.copyryear = 2023 dita.metadata.default.copyrholder = The Qt Company Ltd dita.metadata.default.audience = programmer diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index 187c73da62..0cf9758c03 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -41,6 +41,10 @@ \title Android: App Versioning */ /*! + \externalpage https://developer.android.com/studio/command-line/adb#devicestatus + \title Android: Query for devices +*/ +/*! \externalpage http://www.freedesktop.org/ \title freedesktop.org */ @@ -522,3 +526,8 @@ \externalpage https://login.qt.io/ \title Qt Account Sign-up */ + +/*! + \externalpage https://www.unicode.org/ + \title Unicode standard +*/ diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index e283b32360..5d97a87ad1 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -25,603 +25,641 @@ ** ****************************************************************************/ +// Up-to-date with Qt Creator 6.0.0 + /*! - \externalpage http://doc.qt.io/qtcreator/creator-deployment-qnx.html + \externalpage https://doc.qt.io/qtcreator/creator-deployment-qnx.html \title Qt Creator: Deploying Applications to QNX Neutrino Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-developing-baremetal.html + \externalpage https://doc.qt.io/qtcreator/creator-developing-baremetal.html \title Qt Creator: Connecting Bare Metal Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-developing-qnx.html + \externalpage https://doc.qt.io/qtcreator/creator-developing-qnx.html \title Qt Creator: Connecting QNX Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-developing-generic-linux.html - \title Qt Creator: Connecting Embedded Linux Devices + \externalpage https://doc.qt.io/qtcreator/creator-developing-generic-linux.html + \title Qt Creator: Connecting Generic Remote Linux Devices +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-developing-mcu.html + \title Qt Creator: Connecting MCUs +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-setup-webassembly.html + \title Qt Creator: Building Applications for the Web */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-deployment-embedded-linux.html - \title Qt Creator: Deploying Applications to Embedded Linux Devices + \externalpage https://doc.qt.io/qtcreator/creator-deployment-embedded-linux.html + \title Qt Creator: Deploying Applications to Generic Remote Linux Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-faq.html + \externalpage https://doc.qt.io/qtcreator/creator-faq.html \title Qt Creator: FAQ */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-tips.html - \title Qt Creator: Tips and Tricks + \externalpage https://doc.qt.io/qtcreator/creator-how-tos.html + \title Qt Creator: How-tos */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-help.html + \externalpage https://doc.qt.io/qtcreator/creator-help.html \title Qt Creator: Using the Help Mode */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-quick-tour.html + \externalpage https://doc.qt.io/qtcreator/creator-quick-tour.html \title Qt Creator: User Interface */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-modes.html + \externalpage https://doc.qt.io/qtcreator/creator-modes.html \title Qt Creator: Selecting Modes */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-sidebar-views.html + \externalpage https://doc.qt.io/qtcreator/creator-sidebars.html + \title Qt Creator: Working with Sidebars +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-sidebar-views.html \title Qt Creator: Browsing Project Contents */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-output-panes.html + \externalpage https://doc.qt.io/qtcreator/creator-projects-view.html + \title Qt Creator: Projects +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-file-system-view.html + \title Qt Creator: File System +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-open-documents-view.html + \title Qt Creator: Open Documents +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-output-panes.html \title Qt Creator: Viewing Output */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-cli.html + \externalpage https://doc.qt.io/qtcreator/creator-cli.html \title Qt Creator: Using Command Line Options */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-task-lists.html + \externalpage https://doc.qt.io/qtcreator/creator-task-lists.html \title Qt Creator: Showing Task List Files in Issues Pane */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-managing-sessions.html + \externalpage https://doc.qt.io/qtcreator/creator-telemetry.html + \title Qt Creator: Managing Data Collection +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/collecting-usage-statistics.html + \title Qt Creator: Collecting Usage Statistics +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-project-managing-sessions.html \title Qt Creator: Managing Sessions */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-external.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-external.html \title Qt Creator: Using External Tools */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-version-control.html + \externalpage https://doc.qt.io/qtcreator/creator-version-control.html \title Qt Creator: Using Version Control Systems */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-vcs-bazaar.html + \externalpage https://doc.qt.io/qtcreator/creator-vcs-bazaar.html \title Qt Creator: Using Bazaar */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-vcs-clearcase.html + \externalpage https://doc.qt.io/qtcreator/creator-vcs-clearcase.html \title Qt Creator: Using ClearCase */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-vcs-cvs.html + \externalpage https://doc.qt.io/qtcreator/creator-vcs-cvs.html \title Qt Creator: Using CVS */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-vcs-git.html + \externalpage https://doc.qt.io/qtcreator/creator-vcs-git.html \title Qt Creator: Using Git */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-vcs-mercurial.html + \externalpage https://doc.qt.io/qtcreator/creator-vcs-mercurial.html \title Qt Creator: Using Mercurial */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-vcs-perforce.html + \externalpage https://doc.qt.io/qtcreator/creator-vcs-perforce.html \title Qt Creator: Using Perforce */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-vcs-subversion.html + \externalpage https://doc.qt.io/qtcreator/creator-vcs-subversion.html \title Qt Creator: Using Subversion */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-keyboard-shortcuts.html + \externalpage https://doc.qt.io/qtcreator/creator-keyboard-shortcuts.html \title Qt Creator: Keyboard Shortcuts */ /*! - \externalpage http://doc.qt.io/qtcreator/qmldesigner-pathview-editor.html - \title Qt Creator: Editing PathView Properties -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/qmldesigner-connections.html - \title Qt Creator: Adding Connections -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/quick-signals.html - \title Qt Creator: Connecting Objects to Signals -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/quick-dynamic-properties.html - \title Qt Creator: Specifying Dynamic Properties -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/quick-property-bindings.html - \title Qt Creator: Adding Bindings Between Properties -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/quick-connections-backend.html - \title Qt Creator: Managing C++ Backend Objects -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/qtcreator-transitions-example.html + \externalpage https://doc.qt.io/qtcreator/qtcreator-transitions-example.html \title Qt Creator: Creating a Qt Quick Application */ /*! - \externalpage http://doc.qt.io/qtcreator/qtquick-iso-icon-browser.html - \title Qt Creator: Browsing ISO 7000 Icons -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/quick-export-to-qml.html - \title Qt Creator: Exporting Designs from Graphics Software -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/creator-qml-modules-with-plugins.html + \externalpage https://doc.qt.io/qtcreator/creator-qml-modules-with-plugins.html \title Qt Creator: Using QML Modules with Plugins */ /*! - \externalpage http://doc.qt.io/qtcreator/quick-converting-ui-projects.html + \externalpage https://doc.qt.io/qtcreator/quick-converting-ui-projects.html \title Qt Creator: Converting UI Projects to Applications */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-visual-editor.html + \externalpage https://doc.qt.io/qtcreator/creator-visual-editor.html \title Qt Creator: Developing Qt Quick Applications */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-using-qt-quick-designer.html - \title Qt Creator: Editing QML Files in Design Mode -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/quick-projects.html + \externalpage https://doc.qt.io/qtcreator/quick-projects.html \title Qt Creator: Creating Qt Quick Projects */ /*! - \externalpage http://doc.qt.io/qtcreator/quick-components.html - \title Qt Creator: Creating Components + \externalpage https://doc.qt.io/qtcreator/creator-qtquickdesigner-plugin.html + \title Qt Creator: Using Qt Quick Designer */ /*! - \externalpage http://doc.qt.io/qtcreator/qt-quick-toolbars.html + \externalpage https://doc.qt.io/qtcreator/qt-quick-toolbars.html \title Qt Creator: Using Qt Quick Toolbars */ /*! - \externalpage http://doc.qt.io/qtcreator/quick-buttons.html - \title Qt Creator: Creating Buttons -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/quick-scalable-image.html - \title Qt Creator: Creating Scalable Buttons and Borders -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-options.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-options.html \title Qt Creator: Configuring the Editor */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-functions.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-functions.html \title Qt Creator: Writing Code */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-coding-navigating.html + \externalpage https://doc.qt.io/qtcreator/creator-coding-navigating.html \title Qt Creator: Working in Edit Mode */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-highlighting.html + \externalpage https://doc.qt.io/qtcreator/creator-highlighting.html \title Qt Creator: Semantic Highlighting */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-checking-code-syntax.html + \externalpage https://doc.qt.io/qtcreator/creator-checking-code-syntax.html \title Qt Creator: Checking Code Syntax */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-completing-code.html + \externalpage https://doc.qt.io/qtcreator/creator-completing-code.html \title Qt Creator: Completing Code */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-codepasting.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-codepasting.html \title Qt Creator: Pasting and Fetching Code Snippets */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-macros.html + \externalpage https://doc.qt.io/qtcreator/creator-macros.html \title Qt Creator: Using Text Editing Macros */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-fakevim.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-fakevim.html \title Qt Creator: Using FakeVim Mode */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-indenting-code.html + \externalpage https://doc.qt.io/qtcreator/creator-indenting-code.html \title Qt Creator: Indenting Text or Code */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-finding.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-finding.html \title Qt Creator: Finding and Replacing */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-refactoring.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-refactoring.html \title Qt Creator: Refactoring */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-locator.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-quick-fixes.html + \title Qt Creator: Applying Refactoring Actions +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-editor-locator.html \title Qt Creator: Searching with the Locator */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-coding.html + \externalpage https://doc.qt.io/qtcreator/creator-coding.html \title Qt Creator: Coding */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-options-text.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-options-text.html \title Qt Creator: Specifying Text Editor Settings */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-finding-overview.html + \externalpage https://doc.qt.io/qtcreator/creator-finding-overview.html \title Qt Creator: Finding */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-mime-types.html + \externalpage https://doc.qt.io/qtcreator/creator-mime-types.html \title Qt Creator: Editing MIME Types */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-modeling.html + \externalpage https://doc.qt.io/qtcreator/creator-modeling.html \title Qt Creator: Modeling */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-qml-debugging-example.html + \externalpage https://doc.qt.io/qtcreator/creator-qml-debugging-example.html \title Qt Creator: Debugging a Qt Quick Example Application */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-debugging-example.html + \externalpage https://doc.qt.io/qtcreator/creator-debugging-example.html \title Qt Creator: Debugging a C++ Example Application */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-debugger-engines.html + \externalpage https://doc.qt.io/qtcreator/creator-debugger-engines.html \title Qt Creator: Setting Up Debugger */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-debugging-qml.html + \externalpage https://doc.qt.io/qtcreator/creator-debugging-qml.html \title Qt Creator: Debugging Qt Quick Projects */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-debugging.html + \externalpage https://doc.qt.io/qtcreator/creator-debugging.html \title Qt Creator: Debugging */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-debugger-operating-modes.html + \externalpage https://doc.qt.io/qtcreator/creator-debugger-operating-modes.html \title Qt Creator: Launching the Debugger */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-debug-mode.html + \externalpage https://doc.qt.io/qtcreator/creator-debug-mode.html \title Qt Creator: Interacting with the Debugger */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-debugging-helpers.html + \externalpage https://doc.qt.io/qtcreator/creator-debugging-helpers.html \title Qt Creator: Using Debugging Helpers */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-troubleshooting-debugging.html + \externalpage https://doc.qt.io/qtcreator/creator-troubleshooting-debugging.html \title Qt Creator: Troubleshooting Debugger */ /*! - \externalpage http://doc.qt.io/qtcreator/index.html + \externalpage https://doc.qt.io/qtcreator/index.html \title Qt Creator Manual */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-advanced.html + \externalpage https://doc.qt.io/qtcreator/creator-advanced.html \title Qt Creator: Advanced Use */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-os-supported-platforms.html + \externalpage https://doc.qt.io/qtcreator/creator-os-supported-platforms.html \title Qt Creator: Supported Platforms */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-connecting-mobile.html + \externalpage https://doc.qt.io/qtcreator/creator-desktop-platforms.html + \title Qt Creator: Desktop Platforms +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-embedded-platforms.html + \title Qt Creator: Embedded Platforms +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-mobile-platforms.html + \title Qt Creator: Mobile Platforms +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-connecting-mobile.html \title Qt Creator: Connecting Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-usability.html + \externalpage https://doc.qt.io/qtcreator/creator-usability.html \title Qt Creator: Optimizing Applications for Mobile Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-acknowledgements.html + \externalpage https://doc.qt.io/qtcreator/creator-acknowledgements.html \title Qt Creator: Acknowledgements */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-help-overview.html + \externalpage https://doc.qt.io/qtcreator/creator-help-overview.html \title Qt Creator: Getting Help */ /*! - \externalpage http://doc.qt.io/qtcreator/technical-support.html + \externalpage https://doc.qt.io/qtcreator/technical-support.html \title Qt Creator: Technical Support */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-overview.html + \externalpage https://doc.qt.io/qtcreator/creator-overview.html \title Qt Creator: IDE Overview */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-testing.html + \externalpage https://doc.qt.io/qtcreator/creator-testing.html \title Qt Creator: Testing */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-deployment.html + \externalpage https://doc.qt.io/qtcreator/creator-deployment.html \title Qt Creator: Deploying to Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-tutorials.html + \externalpage https://doc.qt.io/qtcreator/creator-tutorials.html \title Qt Creator: Tutorials */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-known-issues.html + \externalpage https://doc.qt.io/qtcreator/creator-known-issues.html \title Qt Creator: Known Issues */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-design-mode.html + \externalpage https://doc.qt.io/qtcreator/creator-design-mode.html \title Qt Creator: Designing User Interfaces */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-glossary.html + \externalpage https://doc.qt.io/qtcreator/creator-glossary.html \title Qt Creator: Glossary */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-getting-started.html + \externalpage https://doc.qt.io/qtcreator/creator-getting-started.html \title Qt Creator: Getting Started */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-analyzer.html + \externalpage https://doc.qt.io/qtcreator/creator-analyzer.html \title Qt Creator: Detecting Memory Leaks with Memcheck */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-cache-profiler.html + \externalpage https://doc.qt.io/qtcreator/creator-cache-profiler.html \title Qt Creator: Profiling Function Execution */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-running-valgrind-remotely.html + \externalpage https://doc.qt.io/qtcreator/creator-running-valgrind-remotely.html \title Qt Creator: Running Valgrind Tools on External Applications */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-valgrind-overview.html + \externalpage https://doc.qt.io/qtcreator/creator-valgrind-overview.html \title Qt Creator: Using Valgrind Code Analysis Tools */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-analyze-mode.html + \externalpage https://doc.qt.io/qtcreator/creator-analyze-mode.html \title Qt Creator: Analyzing Code */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-qml-performance-monitor.html + \externalpage https://doc.qt.io/qtcreator/creator-qml-performance-monitor.html \title Qt Creator: Profiling QML Applications */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-deploying-android.html + \externalpage https://doc.qt.io/qtcreator/creator-deploying-android.html \title Qt Creator: Deploying Applications to Android Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-developing-ios.html + \externalpage https://doc.qt.io/qtcreator/creator-developing-ios.html \title Qt Creator: Connecting iOS devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-developing-android.html + \externalpage https://doc.qt.io/qtcreator/creator-developing-android.html \title Qt Creator: Connecting Android Devices */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-build-example-application.html + \externalpage https://doc.qt.io/qtcreator/creator-build-example-application.html \title Qt Creator: Building and Running an Example */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-generic.html + \externalpage https://doc.qt.io/qtcreator/creator-project-generic.html \title Qt Creator: Setting Up a Generic Project */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-sharing-project-settings.html + \externalpage https://doc.qt.io/qtcreator/creator-sharing-project-settings.html \title Qt Creator: Sharing Project Settings */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-opening.html + \externalpage https://doc.qt.io/qtcreator/creator-project-opening.html \title Qt Creator: Opening Projects */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-managing.html + \externalpage https://doc.qt.io/qtcreator/creator-project-managing.html \title Qt Creator: Managing Projects */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-cmake.html + \externalpage https://doc.qt.io/qtcreator/creator-project-cmake.html \title Qt Creator: Setting Up CMake */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-targets.html + \externalpage https://doc.qt.io/qtcreator/creator-targets.html \title Qt Creator: Adding Kits */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-tool-chains.html + \externalpage https://doc.qt.io/qtcreator/creator-tool-chains.html \title Qt Creator: Adding Compilers */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-qbs.html + \externalpage https://doc.qt.io/qtcreator/creator-project-qbs.html \title Qt Creator: Setting Up Qbs */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-creating.html + \externalpage https://doc.qt.io/qtcreator/creator-project-creating.html \title Qt Creator: Creating Projects */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-wizards.html + \externalpage https://doc.qt.io/qtcreator/creator-project-wizards.html \title Qt Creator: Adding New Custom Wizards */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-wizards-json.html - \title Qt Creator: Adding JSON-Based Wizards + \externalpage https://doc.qt.io/qtcreator/creator-project-meson.html + \title Qt Creator: Setting Up Meson +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-project-nimble.html + \title Qt Creator: Setting Up Nimble +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-project-incredibuild.html + \title Qt Creator: Setting Up IncrediBuild */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-wizards-xml.html - \title Qt Creator: Adding XML-Based Wizards + \externalpage https://doc.qt.io/qtcreator/creator-project-conan.html + \title Qt Creator: Setting Up Conan */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-projects-autotools.html + \externalpage https://doc.qt.io/qtcreator/creator-projects-autotools.html \title Qt Creator: Setting Up an Autotools Project */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-configuring-projects.html + \externalpage https://doc.qt.io/qtcreator/creator-configuring-projects.html \title Qt Creator: Configuring Projects */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-build-process-customizing.html + \externalpage https://doc.qt.io/qtcreator/creator-build-process-customizing.html \title Qt Creator: Customizing the Build Process */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-build-settings.html + \externalpage https://doc.qt.io/qtcreator/creator-build-settings.html \title Qt Creator: Specifying Build Settings */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-code-style-settings.html + \externalpage https://doc.qt.io/qtcreator/creator-build-settings-cmake.html + \title Qt Creator: CMake Build Configuration +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-build-settings-qmake.html + \title Qt Creator: qmake Build Configuration +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-build-settings-qbs.html + \title Qt Creator: Qbs Build Configuration +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-build-settings-meson.html + \title Qt Creator: Meson Build Configuration +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-build-settings-incredibuild.html + \title Qt Creator: IncrediBuild Build Configuration +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-build-settings-conan.html + \title Qt Creator: Conan Build Configuration +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-code-style-settings.html \title Qt Creator: Specifying Code Style Settings */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-run-settings.html + \externalpage https://doc.qt.io/qtcreator/creator-run-settings.html \title Qt Creator: Specifying Run Settings */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-qmake-libraries.html + \externalpage https://doc.qt.io/qtcreator/creator-project-qmake-libraries.html \title Qt Creator: Adding Libraries to Projects */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-other.html - \title Qt Creator: Using Other Build Systems + \externalpage https://doc.qt.io/qtcreator/creator-project-other.html + \title Qt Creator: Build Systems */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-running-targets.html + \externalpage https://doc.qt.io/qtcreator/creator-running-targets.html \title Qt Creator: Running on Multiple Platforms */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-build-dependencies.html + \externalpage https://doc.qt.io/qtcreator/creator-build-dependencies.html \title Qt Creator: Specifying Dependencies */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-building-running.html + \externalpage https://doc.qt.io/qtcreator/creator-project-settings-environment.html + \title Qt Creator: Specifying Environment Settings +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-custom-output-parsers.html + \title Qt Creator: Using Custom Output Parsers +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-building-running.html \title Qt Creator: Building and Running */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-editor-settings.html + \externalpage https://doc.qt.io/qtcreator/creator-editor-settings.html \title Qt Creator: Specifying Editor Settings */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-qmake.html + \externalpage https://doc.qt.io/qtcreator/creator-project-qmake.html \title Qt Creator: Adding Qt Versions */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-building-targets.html + \externalpage https://doc.qt.io/qtcreator/creator-building-targets.html \title Qt Creator: Building for Multiple Platforms */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-using-qt-designer.html + \externalpage https://doc.qt.io/qtcreator/creator-using-qt-designer.html \title Qt Creator: Developing Widget Based Applications */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-writing-program.html + \externalpage https://doc.qt.io/qtcreator/creator-writing-program.html \title Qt Creator: Creating a Qt Widget Based Application */ /*! - \externalpage http://doc.qt.io/qtcreator/adding-plugins.html + \externalpage https://doc.qt.io/qtcreator/adding-plugins.html \title Qt Creator: Adding Qt Designer Plugins */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-configuring.html + \externalpage https://doc.qt.io/qtcreator/creator-configuring.html \title Qt Creator: Configuring Qt Creator */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-debuggers.html + \externalpage https://doc.qt.io/qtcreator/creator-debuggers.html \title Qt Creator: Adding Debuggers */ /*! - \externalpage http://doc.qt.io/qtcreator/qt-creator-accelbubble-example.html + \externalpage https://doc.qt.io/qtcreator/qtcreator-accelbubble-example.html \title Qt Creator: Creating a Mobile Application */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-diff-editor.html + \externalpage https://doc.qt.io/qtcreator/creator-diff-editor.html \title Qt Creator: Comparing Files */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-beautifier.html + \externalpage https://doc.qt.io/qtcreator/creator-beautifier.html \title Qt Creator: Beautifying Source Code */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-clang-codemodel.html + \externalpage https://doc.qt.io/qtcreator/creator-clang-codemodel.html \title Qt Creator: Parsing C++ Files with the Clang Code Model */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-quick-ui-forms.html - \title Qt Creator: Qt Quick UI Forms + \externalpage https://doc.qt.io/qtcreator/creator-quick-ui-forms.html + \title Qt Creator: UI Files */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-clang-tools.html + \externalpage https://doc.qt.io/qtcreator/creator-clang-tools.html \title Qt Creator: Using Clang Tools */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-heob.html + \externalpage https://doc.qt.io/qtcreator/creator-heob.html \title Qt Creator: Detecting Memory Leaks with Heob */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-cpu-usage-analyzer.html + \externalpage https://doc.qt.io/qtcreator/creator-cpu-usage-analyzer.html \title Qt Creator: Analyzing CPU Usage */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-cppcheck.html + \externalpage https://doc.qt.io/qtcreator/creator-cppcheck.html \title Qt Creator: Analyzing Code with Cppcheck */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-autotest.html + \externalpage https://doc.qt.io/qtcreator/creator-ctf-visualizer.html + \title Qt Creator: Visualizing Chrome Trace Events +*/ +/*! + \externalpage https://doc.qt.io/qtcreator/creator-autotest.html \title Qt Creator: Running Autotests */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-project-creating.html#creating-c-classes + \externalpage https://doc.qt.io/qtcreator/creator-project-creating.html#creating-c-classes \title Qt Creator: Creating C++ Classes */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-writing-program.html + \externalpage https://doc.qt.io/qtcreator/creator-writing-program.html \title Creating a Qt Widget Based Application */ /*! - \externalpage http://doc.qt.io/qtcreator/qtquick-navigator.html - \title Qt Creator: Managing Item Hierarchy -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/qtquick-properties.html - \title Qt Creator: Specifying Item Properties -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/quick-states.html - \title Qt Creator: Adding States -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/creator-scxml.html + \externalpage https://doc.qt.io/qtcreator/creator-scxml.html \title Qt Creator: Editing State Charts */ /*! - \externalpage http://doc.qt.io/qtcreator/studio-timeline.html - \title Qt Creator: Creating Animations -*/ -/*! - \externalpage http://doc.qt.io/qtcreator/creator-language-servers.html + \externalpage https://doc.qt.io/qtcreator/creator-language-servers.html \title Qt Creator: Using Language Servers */ /*! - \externalpage http://doc.qt.io/qtcreator/qtcreator-toc.html + \externalpage https://doc.qt.io/qtcreator/qtcreator-toc.html \title Qt Creator: All Topics */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-live-preview.html - \title Qt Creator: Previewing + \externalpage https://doc.qt.io/qtcreator/creator-live-preview.html + \title Qt Creator: Validating with Target Hardware */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-live-preview-desktop.html + \externalpage https://doc.qt.io/qtcreator/creator-live-preview-desktop.html \title Qt Creator: Previewing on Desktop */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-live-preview-devices.html + \externalpage https://doc.qt.io/qtcreator/creator-live-preview-devices.html \title Qt Creator: Previewing on Devices */ +/*! + \externalpage https://doc.qt.io/qtcreator/qt-design-viewer.html + \title Qt Creator: Previewing in Browsers +*/ diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf index f255726c1d..7b332e263c 100644 --- a/doc/global/html-footer-online.qdocconf +++ b/doc/global/html-footer-online.qdocconf @@ -78,7 +78,7 @@ HTML.footer += \ " <ul id=\"menu-footer-submenu\" class=\"right clearfix\"><li id=\"menu-item-1795\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1795\"><a title=\"Sign into your account.\" href=\"https://account.qt.io/login\">Sign In</a></li>\n" \ " <li id=\"menu-item-10375\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-10375\"><a href=\"mailto:feedback@theqtcompany.com?Subject=Feedback%20about%20doc.qt.io%20site\">Feedback</a></li>\n" \ " <li id=\"menu-item-1494\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1494\"><a href=\"http://qt.io/contact-us/\">Contact us</a></li>\n" \ - " <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://qt.io/about-us/\">© 2020 The Qt Company</a></li>\n" \ + " <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://qt.io/about-us/\">© 2023 The Qt Company</a></li>\n" \ " </ul>\n" \ "</div>\n" \ "</div>\n" \ diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf index 5c29851e90..69d08b316a 100644 --- a/doc/global/html-footer.qdocconf +++ b/doc/global/html-footer.qdocconf @@ -8,13 +8,13 @@ HTML.footer = \ "</div>\n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2020 The Qt Company Ltd.\n" \ + " <acronym title=\"Copyright\">©</acronym> 2023 The Qt Company Ltd.\n" \ " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.<br/>" \ " The documentation provided herein is licensed under the terms of the" \ " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ " License version 1.3</a> as published by the Free Software Foundation.<br/>" \ - " Qt and respective logos are trademarks of The Qt Company Ltd. " \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. </p>\n" \ + " Qt and respective logos are <a href=\"https://doc.qt.io/qt/trademarks.html\">" \ + " trademarks</a> of The Qt Company Ltd. in Finland and/or other countries\n" \ + " worldwide. All other trademarks are property of their respective owners. </p>\n" \ "</div>\n" \ diff --git a/doc/global/includes/standardpath/functiondocs.qdocinc b/doc/global/includes/standardpath/functiondocs.qdocinc index 4385b6446d..4cbf29cd45 100644 --- a/doc/global/includes/standardpath/functiondocs.qdocinc +++ b/doc/global/includes/standardpath/functiondocs.qdocinc @@ -55,6 +55,9 @@ Returns the absolute file path to the executable, or an empty string if not found. + If the given \n executableName is an absolute path pointing to + an executable its clean path is returned. + //! [findExecutable] //! [locate] diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 41fb8acc66..ad7669b65f 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -5,15 +5,15 @@ HTML.footer = \ " </div>\n" \ " <p class=\"copy-notice\">\n" \ - " <acronym title=\"Copyright\">©</acronym> 2020 The Qt Company Ltd.\n" \ + " <acronym title=\"Copyright\">©</acronym> 2023 The Qt Company Ltd.\n" \ " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ " License version 1.3</a> as published by the Free Software Foundation. " \ - " Qt and respective logos are trademarks of The Qt Company Ltd. " \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. </p>\n" + " Qt and respective logos are <a href=\"https://doc.qt.io/qt/trademarks.html\">" \ + " trademarks</a> of The Qt Company Ltd. in Finland and/or other countries\n" \ + " worldwide. All other trademarks are property of their respective owners. </p>\n" #include standard set of macros and C++ defines and ignores include(macros.qdocconf) diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index d2c1841834..706b1eb3f6 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -112,39 +112,18 @@ a[href*="http://"], a[href*="ftp://"], a[href*="https://"] { NOTE styles ------------------------------- */ - -.notetitle, .tiptitle, .fastpathtitle { - font-weight: bold -} - -.attentiontitle, .cautiontitle, .dangertitle, .importanttitle, .remembertitle, .restrictiontitle { - font-weight: bold +.admonition { + padding: 5px 0 5px 40px; + border: #ccc 1px solid; } -.note, .tip, .fastpath { - background: #F2F2F2 url(../images/ico_note.png); - background-repeat: no-repeat; - background-position: top left; - padding: 5px; - padding-left: 40px; - padding-bottom: 10px; - border: #999 1px dotted; - color: #666666; - margin: 5px; +.admonition.note, .admonition.important { + background: #f2f2f2 3px 6px no-repeat url(../images/ico_note.png); } -.attention, .caution, .danger, .important, .remember, .restriction { - background: #F2F2F2 url(../images/ico_note_attention.png); - background-repeat: no-repeat; - background-position: top left; - padding: 5px; - padding-left: 40px; - padding-bottom: 10px; - border: #999 1px dotted; - color: #666666; - margin: 5px; +.admonition.warning { + background: #f2f2f2 3px 6px no-repeat url(../images/ico_note_attention.png); } - /* ------------------------------- Top navigation @@ -166,7 +145,7 @@ Top navigation display: block; position: relative; text-align: right; - top: -47px; + top: -30px; float: right; height: 20px; z-index: 1; diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index 48fe0bfc02..0c8ed5c5a8 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -992,6 +992,25 @@ pre, .LegaleseLeft { color:#fff; white-space: pre-wrap } +div.admonition { + margin:1.5em 0 1.5em; + padding:12px; +} +div.admonition.note { + background-color:#c5d3f4; + border-left:5px solid #7a9ae5; +} +div.admonition.warning { + background-color:#ffe4e4; + border-left:5px solid #ff8383; +} +div.admonition.important { + background-color:#fef9f3; + border-left:5px solid #f6cb97; +} +.mainContent .admonition p { + margin:0; +} pre .str,code .str { color:#aaaaaa } diff --git a/doc/src/snippets/code/src_corelib_tools_qvector.cpp b/doc/src/snippets/code/src_corelib_tools_qvector.cpp index 299bb0da85..dd3c991290 100644 --- a/doc/src/snippets/code/src_corelib_tools_qvector.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qvector.cpp @@ -158,10 +158,10 @@ vector.lastIndexOf("X"); // returns -1 //! [14] -QVector<double> vect; +QVector<QString> vect; vect << "red" << "green" << "blue" << "black"; -QList<double> list = vect.toList(); +QList<QString> list = vect.toList(); // list: ["red", "green", "blue", "black"] //! [14] |