diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2015-03-02 09:23:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2015-03-02 09:23:07 +0100 |
commit | 2b5982aac8ad103443e33379fe5654f5bd419c87 (patch) | |
tree | 8cc1d4e00029a6c0f5a23d87e9c97cdfc4619538 /doc/global/externalsites | |
parent | efe3f631f232e6cc3966de59b9237653bf7fa96e (diff) | |
parent | fc3733cba4652f2b8930c66665103fcb20874735 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e
Diffstat (limited to 'doc/global/externalsites')
-rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index 888f1d6fe7..695a4ff7f4 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -58,7 +58,7 @@ */ /*! - \externalpage http://qt-project.org/wiki/Qt_Coding_Style + \externalpage http://wiki.qt.io/?title=Qt_Coding_Style \title Qt Coding Style */ /*! @@ -78,16 +78,16 @@ \title Pimp my video */ /*! - \externalpage http://qt-project.org/wiki/QtMediaHub + \externalpage http://wiki.qt.io/?title=QtMediaHub \title QtMediaHub */ /*! - \externalpage http://qt-project.org/wiki/Qt-RaspberryPi + \externalpage http://wiki.qt.io/?title=Qt_RaspberryPi \title QtonPi */ /*! - \externalpage http://qt-project.org/wiki/jom + \externalpage http://wiki.qt.io/?title=jom \title jom */ @@ -102,11 +102,11 @@ */ /*! - \externalpage http://qt-project.org/wiki/Qt-Localization + \externalpage http://wiki.qt.io/?title=Qt_Localization \title external: Translating Qt Into Other Languages */ /*! - \externalpage http://qt-project.org/wiki/BlackBerry + \externalpage http://wiki.qt.io/?title=BlackBerry \title Qt for BlackBerry */ |