diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-31 13:10:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-31 14:31:31 +0200 |
| commit | 112a4af10741409b3d8503cb77852a777b607ce0 (patch) | |
| tree | fa99f0f37fc1505522fe9368e95484c7732ccda8 /doc/global/externalsites/qtcreator.qdoc | |
| parent | 29ef0d2bccd1874e20de94485ee05777c3a95c5d (diff) | |
| parent | e938150412d22e61926fe16791158805b71268bb (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
examples/examples.pro
qmake/library/qmakebuiltins.cpp
src/corelib/global/qglobal.cpp
Re-apply b525ec2 to qrandom.cpp(code movement in 030782e)
src/corelib/global/qnamespace.qdoc
src/corelib/global/qrandom.cpp
src/gui/kernel/qwindow.cpp
Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08)
src/network/ssl/qsslkey_openssl.cpp
src/plugins/platforms/android/androidjniinput.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/widgets/widgets/qmenu.cpp
tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3
Diffstat (limited to 'doc/global/externalsites/qtcreator.qdoc')
| -rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index 4b9160cea4..7f2322d041 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -118,10 +118,6 @@ \title Qt Creator: Creating Screens */ /*! - \externalpage http://doc.qt.io/qtcreator/creator-qtquick-designer-extensions.html - \title Qt Creator: Using Qt Quick Designer Extensions -*/ -/*! \externalpage http://doc.qt.io/qtcreator/qmldesigner-pathview-editor.html \title Qt Creator: Editing PathView Properties */ @@ -295,7 +291,7 @@ */ /*! \externalpage http://doc.qt.io/qtcreator/creator-connecting-mobile.html - \title Qt Creator: Connecting Mobile Devices + \title Qt Creator: Connecting Devices */ /*! \externalpage http://doc.qt.io/qtcreator/creator-usability.html @@ -323,7 +319,7 @@ */ /*! \externalpage http://doc.qt.io/qtcreator/creator-deployment.html - \title Qt Creator: Deploying to Mobile Devices + \title Qt Creator: Deploying to Devices */ /*! \externalpage http://doc.qt.io/qtcreator/creator-tutorials.html @@ -405,7 +401,7 @@ */ /*! \externalpage http://doc.qt.io/qtcreator/creator-project-cmake.html - \title Qt Creator: Setting Up a CMake Project + \title Qt Creator: Setting Up CMake */ /*! \externalpage http://doc.qt.io/qtcreator/creator-targets.html @@ -417,7 +413,7 @@ */ /*! \externalpage http://doc.qt.io/qtcreator/creator-project-qbs.html - \title Qt Creator: Setting Up a Qbs Project + \title Qt Creator: Setting Up Qbs */ /*! \externalpage http://doc.qt.io/qtcreator/creator-project-creating.html @@ -523,22 +519,16 @@ \externalpage http://doc.qt.io/qtcreator/creator-beautifier.html \title Qt Creator: Beautifying Source Code */ -/*! - \externalpage http://doc.qt.io/qtcreator/creator-developing-winrt.html - \title Qt Creator: Connecting Windows Runtime Devices -*/ + /*! \externalpage http://doc.qt.io/qtcreator/creator-clang-codemodel.html - \title Qt Creator: Parsing C++ Files + \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 http://doc.qt.io/qtcreator/qtcreator-uiforms-example.html - \title Qt Creator: Using Qt Quick UI Forms -*/ + /*! \externalpage http://doc.qt.io/qtcreator/creator-clang-static-analyzer.html \title Qt Creator: Using Clang Static Analyzer |