summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/global/externalsites/qtcreator.qdoc52
-rw-r--r--doc/global/html-footer.qdocconf30
-rw-r--r--doc/global/manifest-meta.qdocconf109
-rw-r--r--doc/global/qt-cpp-defines.qdocconf1
-rw-r--r--doc/global/template/style/offline.css50
5 files changed, 154 insertions, 88 deletions
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc
index 9ac80eb831..0a6e8dc5d1 100644
--- a/doc/global/externalsites/qtcreator.qdoc
+++ b/doc/global/externalsites/qtcreator.qdoc
@@ -30,6 +30,10 @@
\title Qt Creator: Deploying Applications to QNX Devices
*/
/*!
+ \externalpage http://qt-project.org/doc/qtcreator/creator-developing-baremetal.html
+ \title Qt Creator: Connecting Bare Metal Devices
+*/
+/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-bb10.html
\title Qt Creator: Connecting BlackBerry 10 Devices
*/
@@ -46,32 +50,8 @@
\title Qt Creator: Connecting Embedded Linux Devices
*/
/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-publish-ovi-maemo.html
- \title Qt Creator: Publishing Qt Content for Maemo Devices
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-maemo-emulator.html
- \title Qt Creator: Using Maemo or MeeGo Harmattan Emulator
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-developing-meego.html
- \title Qt Creator: Connecting MeeGo Harmattan Devices
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-developing-maemo.html
- \title Qt Creator: Connecting Maemo Devices
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-publish-ovi-meego.html
- \title Qt Creator: Publishing Qt Content for MeeGo Harmattan Devices
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-publishing-to-maemo-extras.html
- \title Qt Creator: Publishing Maemo Applications to Extras-devel
-*/
-/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-deployment-maemo.html
- \title Qt Creator: Deploying Applications to Linux-Based Devices
+ \title Qt Creator: Deploying Applications to Embedded Linux Devices
*/
/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-faq.html
@@ -118,14 +98,6 @@
\title Qt Creator: Creating Screens
*/
/*!
- \externalpage http://qt-project.org/doc/qtcreator/quick-animations.html
- \title Qt Creator: Animating Screens
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/quick-user-interaction.html
- \title Qt Creator: Adding User Interaction Methods
-*/
-/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-qml-application.html
\title Qt Creator: Creating a Qt Quick Application
*/
@@ -142,10 +114,6 @@
\title Qt Creator: Developing Qt Quick Applications
*/
/*!
- \externalpage http://qt-project.org/doc/qtcreator/quick-application-logic.html
- \title Qt Creator: Implementing Application Logic
-*/
-/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-using-qt-quick-designer.html
\title Qt Creator: Using Qt Quick Designer
*/
@@ -369,6 +337,12 @@
\externalpage http://qt-project.org/doc/qtcreator/creator-deploying-android.html
\title Qt Creator: Deploying Applications to Android Devices
*/
+
+/*!
+ \externalpage http://qt-project.org/doc/qtcreator/creator-developing-ios.html
+ \title Qt Creator: Connecting iOS devices
+*/
+
/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-android.html
\title Qt Creator: Connecting Android Devices
@@ -489,3 +463,7 @@
\externalpage http://qt-project.org/doc/qtcreator/creator-configuring.html
\title Qt Creator: Configuring Qt Creator
*/
+/*!
+ \externalpage http://qt-project.org/doc/qtcreator/creator-debuggers.html
+ \title Qt Creator: Adding Debuggers
+*/
diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf
index 6c26dc7c29..c53eb2f599 100644
--- a/doc/global/html-footer.qdocconf
+++ b/doc/global/html-footer.qdocconf
@@ -7,24 +7,14 @@ HTML.footer = \
" </div>\n" \
"</div>\n" \
"<div class=\"footer\">\n" \
- " <div class=\"qt13a-copyright\" id=\"copyright\">\n" \
- " <div class=\"qt13a-container\">\n" \
- " <p>\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2013 Digia Plc and/or its\n" \
- " subsidiaries. Documentation contributions included herein are the copyrights of\n" \
- " their respective owners.</p>\n" \
- " <p>\n" \
- " The documentation provided herein is licensed under the terms of the\n" \
- " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \
- " License version 1.3</a> as published by the Free Software Foundation.</p>\n" \
- " <p>\n" \
- " Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \
- " www.qt-project.org</a>.</p>\n" \
- " <p>\n" \
- " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
- " in Finland and/or other countries worldwide. All other trademarks are property\n" \
- " of their respective owners. <a title=\"Privacy Policy\"\n" \
- " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \
- " </div>\n" \
- " </div>\n" \
+ " <p>\n" \
+ " <acronym title=\"Copyright\">&copy;</acronym> 2013 Digia Plc and/or its\n" \
+ " subsidiaries. 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>" \
+ " Digia, Qt and their respective logos are trademarks of Digia Plc " \
+ " in Finland and/or other countries worldwide. All other trademarks are property\n" \
+ " of their respective owners. </p>\n" \
"</div>\n" \
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf
index 93cd7ddc55..fb0f5c200b 100644
--- a/doc/global/manifest-meta.qdocconf
+++ b/doc/global/manifest-meta.qdocconf
@@ -32,7 +32,7 @@
# manifestmeta.global.names = *
# manifestmeta.global.tags = qt5
-manifestmeta.filters = highlighted webkit1 webkit2 android thumbnail
+manifestmeta.filters = highlighted webkit1 webkit2 android thumbnail ios
manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \
"QtQuick/Qt Quick Demo - Photo Surface" \
@@ -125,8 +125,11 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \
"QtLinguist/Arrow Pad Example" \
"QtGui/Raster Window Example" \
"QtGui/Analog Clock Window Example" \
- "QtMultimediaWidgets/Video Widget Example" \
- "QtMultimediaWidgets/Media Player Example" \
+ "QtAndroidExtras/Qt Notifier" \
+ "QtMultimedia/QML Video Shader Effects Example" \
+ "QtMultimedia/QML Video Example" \
+ "QtMultimedia/QML Camera Example" \
+ "QtMultimedia/Audio Output Example" \
"QtSVG/Text Object Example" \
"QtQML/Qt Quick Examples - XMLHttpRequest" \
"QtQuick/Qt Quick Particles Examples - *" \
@@ -138,6 +141,9 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \
"QtQuick/Qt Quick Examples - Animation" \
"QtQuick/Qt Quick Examples - Shader Effects" \
"QtQuick/Qt Quick Examples - Canvas" \
+ "QtQuick/Qt Quick Examples - MouseArea" \
+ "QtQuick/Qt Quick Examples - Positioners" \
+ "QtQuick/Qt Quick Examples - Right to Left" \
"QtWidgets/Interview" \
"QtWidgets/Spreadsheet" \
"QtWidgets/Pixelator Example" \
@@ -164,11 +170,106 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \
"QtQML/Extending QML - Methods Example" \
"QtQML/Extending QML - Signal Support Example" \
"QtQML/Extending QML - Attached Properties Example" \
- "QtQuick/Qt Quick Examples - Window and Screen" \
"QtWidgets/Address Book Example"
manifestmeta.android.tags = android
+manifestmeta.ios.names = "QtCore/Contiguous Cache Example" \
+ "QtCore/Mandelbrot Example" \
+ "QtCore/Queued Custom Type Example" \
+ "QtGui/Analog Clock Window Example" \
+ "QtGui/OpenGL Window Example" \
+ "QtGui/Raster Window Example" \
+ "QtNetwork/Loopback Example" \
+ "QtNetwork/Network Chat Example" \
+ "QtNetwork/Torrent Example" \
+ "QtOpenGL/2D Painting Example" \
+ "QtOpenGL/Textures Example" \
+ "QtWidgets/Animated Tiles Example" \
+ "QtWidgets/Application Chooser Example" \
+ "QtWidgets/Easing Curves Example" \
+ "QtWidgets/Move Blocks Example" \
+ "QtWidgets/States Example" \
+ "QtWidgets/Class Wizard Example" \
+ "QtWidgets/Find Files Example" \
+ "QtWidgets/License Wizard Example" \
+ "QtWidgets/Standard Dialogs Example" \
+ "QtWidgets/Tab Dialog Example" \
+ "QtWidgets/Trivial Wizard Example" \
+ "QtWidgets/Draggable Text Example" \
+ "QtWidgets/Fridge Magnets Example" \
+ "QtWidgets/Blur Picker Effect Example" \
+ "QtWidgets/Fade Message Effect Example" \
+ "QtWidgets/Lighting Effect Example" \
+ "QtWidgets/Anchor Layout Example" \
+ "QtWidgets/Basic Graphics Layouts Example" \
+ "QtWidgets/40000 Chips" \
+ "QtWidgets/Colliding Mice Example" \
+ "QtWidgets/Diagram Scene Example" \
+ "QtWidgets/Elastic Nodes Example" \
+ "QtWidgets/Embedded Dialogs" \
+ "QtWidgets/Graphics View Flow Layout Example" \
+ "QtWidgets/Simple Anchor Layout Example" \
+ "QtWidgets/Weather Anchor Layout Example" \
+ "QtWidgets/Address Book Example" \
+ "QtWidgets/Basic Sort/Filter Model Example" \
+ "QtWidgets/Chart Example" \
+ "QtWidgets/Custom Sort/Filter Model Example" \
+ "QtWidgets/Dir View Example" \
+ "QtWidgets/Editable Tree Model Example" \
+ "QtWidgets/Frozen Column Example" \
+ "QtWidgets/Interview" \
+ "QtWidgets/Simple Tree Model Example" \
+ "QtWidgets/Simple Widget Mapper Example" \
+ "QtWidgets/Basic Layouts Example" \
+ "QtWidgets/Border Layout Example" \
+ "QtWidgets/Flow Layout Example" \
+ "QtWidgets/Basic Drawing Example" \
+ "QtWidgets/Concentric Circles Example" \
+ "QtWidgets/Font Sampler Example" \
+ "QtWidgets/Gradients" \
+ "QtWidgets/Image Composition Example" \
+ "QtWidgets/Painter Paths Example" \
+ "QtWidgets/Transformations Example" \
+ "QtWidgets/Calendar Example" \
+ "QtWidgets/Order Form Example" \
+ "QtWidgets/Syntax Highlighter Example" \
+ "QtWidgets/Text Edit" \
+ "QtWidgets/Traffic Light Example" \
+ "QtWidgets/Two-way Button Example" \
+ "QtWidgets/Completer Example" \
+ "QtWidgets/Custom Completer Example" \
+ "QtWidgets/Undo Framework" \
+ "QtWidgets/Analog Clock Example" \
+ "QtWidgets/Calculator Example" \
+ "QtWidgets/Calendar Widget Example" \
+ "QtWidgets/Character Map Example" \
+ "QtWidgets/Code Editor Example" \
+ "QtWidgets/Digital Clock Example" \
+ "QtWidgets/Elided Label Example" \
+ "QtWidgets/Line Edits Example" \
+ "QtWidgets/Scribble Example" \
+ "QtWidgets/Shaped Clock Example" \
+ "QtWidgets/Sliders Example" \
+ "QtWidgets/Validators Example" \
+ "QtWidgets/Window Flags Example" \
+ "QtWidgets/Wiggly Example" \
+ "QtQuick/Qt Quick Examples - Animation" \
+ "QtQuick/Qt Quick Examples - Canvas" \
+ "QtQuick/Qt Quick Examples - Drag and Drop" \
+ "QtQuick/Qt Quick Examples - Image Elements" \
+ "QtQuick/Qt Quick Examples - MouseArea" \
+ "QtQuick/Qt Quick Examples - Positioners" \
+ "QtQuick/Qt Quick Examples - Right to Left" \
+ "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"
+
+manifestmeta.ios.tags = ios
+
# add a generic thumbnail image to examples that do not have any images in their documentation
manifestmeta.thumbnail.attributes = "imageUrl:qthelp\://org.qt-project.qtdoc.$QT_VERSION_TAG/qtdoc/images/qt-codesample.png"
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index b1738e129f..528b0cd561 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -15,6 +15,7 @@ defines += Q_QDOC \
Q_NO_USING_KEYWORD \
__cplusplus \
Q_COMPILER_INITIALIZER_LISTS \
+ Q_COMPILER_UNIFORM_INIT \
Q_COMPILER_RVALUE_REFS
Cpp.ignoretokens += \
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index 5dc4908aff..81e11aac0b 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -192,7 +192,29 @@ footer and license
*/
.footer {
- text-align: center
+ text-align: left;
+ margin-top: 50px;
+ padding-left: 5px;
+ margin-bottom: 10px;
+ font-size: 10px;
+ border-top: 1px solid #999;
+ padding-top: 11px;
+}
+
+.footer p {
+ line-height: 14px;
+ font-size: 11px;
+}
+
+.footer a[href*="http://"], a[href*="ftp://"], a[href*="https://"] {
+ font-weight: bold;
+}
+
+.footerNavi {
+ width: auto;
+ text-align: right;
+ margin-top: 50px;
+ z-index: 1;
}
.navigationbar {
@@ -244,16 +266,6 @@ footer and license
padding-right: 17px;
}
-/*
------------
-footer and license
------------
-*/
-
-.footer {
- text-align: center
-}
-
#buildversion {
font-style: italic;
font-size: small;
@@ -492,22 +504,6 @@ ol {
padding: 20px 20px 20px 20px;
}
-.footer {
- margin-top: 50px;
- padding-left: 5px;
- margin-bottom: 10px;
- font-size: 10px;
- border-top: 1px solid #999;
- padding-top: 11px;
-}
-
-.footerNavi {
- width: auto;
- text-align: right;
- margin-top: 50px;
- z-index: 1;
-}
-
.memItemLeft {
padding-right: 3px
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 01:08:38 +0000