diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-09 09:30:43 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-09 07:51:49 +0000 |
commit | 1d53b6d9f2d7d0427ff56cfa50d98ac97f99c1bc (patch) | |
tree | d270812c4b648f51090e1262972846b1b4de8116 /doc | |
parent | 89d0a03c067b42155b1a2d310f8514f595abfd61 (diff) | |
parent | 5cea83a8a2fc3384bb07a7265c8d907171cb1ea4 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
Change-Id: Idd3ca5cb9a2b95a4c3513b2a4c8966e6f56193f1
Diffstat (limited to 'doc')
-rw-r--r-- | doc/doc.pro | 4 | ||||
-rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 48 |
2 files changed, 49 insertions, 3 deletions
diff --git a/doc/doc.pro b/doc/doc.pro index 41ceb7ceae..802bd12222 100644 --- a/doc/doc.pro +++ b/doc/doc.pro @@ -1,6 +1,8 @@ TEMPLATE = aux -global_docs.files = $$PWD/global +global_docs.files = \ + $$PWD/global \ + $$PWD/config global_docs.path = $$[QT_INSTALL_DOCS] INSTALLS += global_docs !prefix_build:!equals(OUT_PWD, $$PWD): \ diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index 98a5c9f12b..e283b32360 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -62,6 +62,18 @@ \title Qt Creator: User Interface */ /*! + \externalpage http://doc.qt.io/qtcreator/creator-modes.html + \title Qt Creator: Selecting Modes +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-sidebar-views.html + \title Qt Creator: Browsing Project Contents +*/ +/*! + \externalpage http://doc.qt.io/qtcreator/creator-output-panes.html + \title Qt Creator: Viewing Output +*/ +/*! \externalpage http://doc.qt.io/qtcreator/creator-cli.html \title Qt Creator: Using Command Line Options */ @@ -125,7 +137,7 @@ \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 */ @@ -154,6 +166,10 @@ \title Qt Creator: Using QML Modules with Plugins */ /*! + \externalpage http://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 \title Qt Creator: Developing Qt Quick Applications */ @@ -554,6 +570,10 @@ \title Qt Creator: Analyzing CPU Usage */ /*! + \externalpage http://doc.qt.io/qtcreator/creator-cppcheck.html + \title Qt Creator: Analyzing Code with Cppcheck +*/ +/*! \externalpage http://doc.qt.io/qtcreator/creator-autotest.html \title Qt Creator: Running Autotests */ @@ -581,3 +601,27 @@ \externalpage http://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 + \title Qt Creator: Using Language Servers +*/ +/*! + \externalpage http://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 http://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 + \title Qt Creator: Previewing on Devices +*/ |