diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-10 07:58:06 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-10 07:58:06 +0100 |
| commit | 015002fec9abff6a4c1bb3fa4b9de87279a079c3 (patch) | |
| tree | ad93af535a503d0a49d6c6367e990a8fbca163d3 /doc/global/externalsites/qch-urls.qdoc | |
| parent | f1e00262321cc8daa3c7506153653453e2779886 (diff) | |
| parent | b9547af45ea2bbbc634722c1ef41afdb54216ce2 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
doc/global/template/style/online.css
mkspecs/android-g++/qmake.conf
Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61
Diffstat (limited to 'doc/global/externalsites/qch-urls.qdoc')
| -rw-r--r-- | doc/global/externalsites/qch-urls.qdoc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/global/externalsites/qch-urls.qdoc b/doc/global/externalsites/qch-urls.qdoc index f8ff8df7a0..53ab94091e 100644 --- a/doc/global/externalsites/qch-urls.qdoc +++ b/doc/global/externalsites/qch-urls.qdoc @@ -38,7 +38,7 @@ \title external: Publishing Applications to Ovi Store */ /*! - \externalpage http://qt-project.org/doc/qtcreator + \externalpage http://doc.qt.io/qtcreator \title external: Qt Creator Manual */ /*! @@ -50,31 +50,31 @@ \title external: Qt Mobility QML Plugins */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-project-managing.html + \externalpage http://doc.qt.io/qtcreator/creator-project-managing.html \title external: Creating Qt Projects in Creator */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-building-running.html + \externalpage http://doc.qt.io/qtcreator/creator-building-running.html \title external: Building and Running Applications in Creator */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-running-targets.html + \externalpage http://doc.qt.io/qtcreator/creator-running-targets.html \title external: Set Compiler Targets in Creator */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-build-settings.html + \externalpage http://doc.qt.io/qtcreator/creator-build-settings.html \title external: Build Settings in Creator */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-run-settings.html + \externalpage http://doc.qt.io/qtcreator/creator-run-settings.html \title external: Run Settings in Creator */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-using-qt-designer.html + \externalpage http://doc.qt.io/qtcreator/creator-using-qt-designer.html \title external: Designer in Creator */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-debugging.html + \externalpage http://doc.qt.io/qtcreator/creator-debugging.html \title external: Debugging Applications in Creator */ /*! @@ -90,6 +90,6 @@ \title external: Qt Mobility Examples */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-overview.html + \externalpage http://doc.qt.io/qtcreator/creator-overview.html \title external: Qt Creator Overview */ |