diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/exampleurl-qtquickcontrols2.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/config.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 4 | ||||
| -rw-r--r-- | doc/global/html-footer-online.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/html-footer.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/includes/module-use.qdocinc | 7 | ||||
| -rw-r--r-- | doc/global/macros.qdocconf | 3 | ||||
| -rw-r--r-- | doc/global/manifest-meta.qdocconf | 42 | ||||
| -rw-r--r-- | doc/global/qt-module-defaults-online.qdocconf | 2 | ||||
| -rw-r--r-- | doc/src/images/bearermonitor-example.png | bin | 34862 -> 0 bytes |
10 files changed, 48 insertions, 18 deletions
diff --git a/doc/config/exampleurl-qtquickcontrols2.qdocconf b/doc/config/exampleurl-qtquickcontrols2.qdocconf index 3e2749ec65..4b1d751b60 100644 --- a/doc/config/exampleurl-qtquickcontrols2.qdocconf +++ b/doc/config/exampleurl-qtquickcontrols2.qdocconf @@ -1 +1 @@ -url.examples = "https://code.qt.io/cgit/qt/qtquickcontrols2.git/tree/examples/\1?h=$QT_VER" +url.examples = "https://code.qt.io/cgit/qt/qtdeclarative.git/tree/examples/\1?h=$QT_VER" diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf index 06e3565101..184292cc80 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 = 2022 +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 292105efb4..3bf48bfd3b 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -563,6 +563,6 @@ */ /*! - \externalpage https://www.froglogic.com/testcenter/ - \title Squish Test Center + \externalpage https://www.qt.io/product/quality-assurance/test-center + \title Test Center */ diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf index 523d228b93..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/\">© 2022 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 f799534c58..69d08b316a 100644 --- a/doc/global/html-footer.qdocconf +++ b/doc/global/html-footer.qdocconf @@ -8,7 +8,7 @@ HTML.footer = \ "</div>\n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2022 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" \ diff --git a/doc/global/includes/module-use.qdocinc b/doc/global/includes/module-use.qdocinc index 747148b254..234d79c305 100644 --- a/doc/global/includes/module-use.qdocinc +++ b/doc/global/includes/module-use.qdocinc @@ -18,9 +18,10 @@ //! [using qt module] //! [using the c++ api] - Using a Qt module requires linking against the module library, either - directly or through other dependencies. Several build tools have dedicated - support for this, including \l{CMake Documentation}{CMake} and \l{qmake}. + Using a Qt module's C++ API requires linking against the module library, + either directly or through other dependencies. Several build tools have + dedicated support for this, including \l{CMake Documentation}{CMake} and + \l{qmake}. //! [using the c++ api] //! [using the qml api] diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index 31cecc1b78..e79ed161ff 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -85,3 +85,6 @@ macro.cmakevariableandroidonly = "\\note This variable is used only if targeting macro.versionlessCMakeCommandsNote = "If \\l{Versionless commands}{versionless commands} are disabled, use \\c{\1} instead. It supports the same set of arguments as this command." macro.cmakepropertywebassemblyonly = "\\note This property is used only if targeting the WebAssembly platform." + +macro.cmakepropertyiosonly = "\\note This property is used only if targeting iOS." +macro.cmakevariableiosonly = "\\note This variable is used only if targeting iOS." diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index e9e273461d..d2fb70ff58 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -71,13 +71,36 @@ manifestmeta.android.names = "Qt3D/Qt 3D: Basic Shapes C++ Example" \ "QtQML/Extending QML - Signal Support Example" \ "QtQML/Qt Quick Examples - XMLHttpRequest" \ "QtQml/Qt Quick Examples - XMLHttpRequest" \ - "QtQuick/*" \ - "QtQuickControls/*" \ - "QtQuickControls1/Qt Quick Controls 1 - Calendar Example" \ - "QtQuickControls1/Qt Quick Controls 1 - Gallery" \ - "QtQuickControls1/Qt Quick Controls 1 - Styles Example" \ - "QtQuickControls1/Qt Quick Controls 1 - Table View Example" \ - "QtQuickControls1/Qt Quick Controls 1 - Touch Gallery" \ + "QtQuick/C++ Extensions*" \ + "QtQuick/Models and Views*" \ + "QtQuick/QQuickRenderControl OpenGL Example" \ + "QtQuick/QQuickWidget - QQuickView Comparison Example" \ + "QtQuick/QML*" \ + "QtQuick/Qt Quick*" \ + "QtQuick/Scene Graph - Custom Geometry" \ + "QtQuick/Scene Graph - Custom Material" \ + "QtQuick/Scene Graph - Graph" \ + "QtQuick/Scene Graph - OpenGL Under QML" \ + "QtQuick/Scene Graph - Painted Item" \ + "QtQuick/Scene Graph - Rendering FBOs" \ + "QtQuick/Scene Graph - Two Texture Providers" \ + "QtQuick/Scene Graph - Vulkan Under QML" \ + "QtQuick/Scene Graph - Vulkan Texture Import" \ + "QtQuick/Threaded ListModel Example" \ + "QtQuick/TabWidget Example" \ + "QtQuick/UI Components*" \ + "QtQuickControls/Qt Quick Controls - Attached Style Properties Example" \ + "QtQuickControls/Qt Quick Controls - Chat Tutorial" \ + "QtQuickControls/Qt Quick Controls - Contact List" \ + "QtQuickControls/Qt Quick Controls - Event Calendar" \ + "QtQuickControls/Qt Quick Controls - Flat Style" \ + "QtQuickControls/Qt Quick Controls - Gallery" \ + "QtQuickControls/Qt Quick Controls - Imagine Style Example: Automotive" \ + "QtQuickControls/Qt Quick Controls - Imagine Style Example: Music Player" \ + "QtQuickControls/Qt Quick Controls - Side Panel" \ + "QtQuickControls/Qt Quick Controls - Swipe to Remove" \ + "QtQuickControls/Qt Quick Controls - Text Editor" \ + "QtQuickControls/Qt Quick Controls - Wearable Demo" \ "QtQuickDialogs/*" \ "QtQuickExtras/*" \ "QtSCXML/Qt SCXML Calculator QML Example" \ @@ -216,12 +239,15 @@ manifestmeta.ios.names = "QtCore/Contiguous Cache Example" \ "QtQuick/Qt Quick Examples - MouseArea" \ "QtQuick/Qt Quick Examples - Positioners" \ "QtQuick/Qt Quick Examples - Right to Left" \ + "QtQuick/Scene Graph - Metal Texture Import" \ + "QtQuick/Scene Graph - Metal Under QML" \ "QtQuick/Scene Graph - OpenGL Under QML" \ "QtQuick/Qt Quick Examples - Shader Effects" \ "QtQuick/Qt Quick Examples - Text" \ "QtQuick/Qt Quick Examples - Touch Interaction" \ "QtQuick/Qt Quick Examples - Views" \ - "QtQuick/Qt Quick Examples - Window and Screen" + "QtQuick/Qt Quick Examples - Window and Screen" \ + "QtQuickControls/Qt Quick Controls - To Do List" manifestmeta.ios.tags = ios diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 6acf3a47d8..4b682cfd6c 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -5,7 +5,7 @@ HTML.footer = \ " </div>\n" \ " <p class=\"copy-notice\">\n" \ - " <acronym title=\"Copyright\">©</acronym> 2022 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" \ diff --git a/doc/src/images/bearermonitor-example.png b/doc/src/images/bearermonitor-example.png Binary files differdeleted file mode 100644 index 1b8a9c3834..0000000000 --- a/doc/src/images/bearermonitor-example.png +++ /dev/null |
