diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-06 19:10:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-06 19:10:25 +0200 |
| commit | 20cac3d9c9c22153e9e316daff32b6050ff6be6b (patch) | |
| tree | b563a89475df9afb4f40841ec371be9488d5b1ed /doc/global/externalsites | |
| parent | 8ce85d74b692392a4ea0785360156f37418cff13 (diff) | |
| parent | 9eb0b09abce28b11e4915fc9c3b3e996eb19cef2 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If9fd98525b6b4ca07e5e006fc98bf372a73b8a21
Diffstat (limited to 'doc/global/externalsites')
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 5 | ||||
| -rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 12 |
2 files changed, 6 insertions, 11 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index 96ff35aee4..d2cf88c174 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -449,11 +449,6 @@ */ /*! - \externalpage http://wiki.forum.nokia.com/ - \title Forum Nokia Wiki -*/ - -/*! \externalpage http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html \title AccessibleEventID.idl File Reference */ diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index c8dfe81f88..057f0259e9 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -58,7 +58,7 @@ */ /*! - \externalpage http://wiki.qt.io/?title=Qt_Coding_Style + \externalpage http://wiki.qt.io/Qt_Coding_Style \title Qt Coding Style */ /*! @@ -78,16 +78,16 @@ \title Pimp my video */ /*! - \externalpage http://wiki.qt.io/?title=QtMediaHub + \externalpage http://wiki.qt.io/QtMediaHub \title QtMediaHub */ /*! - \externalpage http://wiki.qt.io/?title=Qt_RaspberryPi + \externalpage http://wiki.qt.io/Qt_RaspberryPi \title QtonPi */ /*! - \externalpage http://wiki.qt.io/?title=jom + \externalpage http://wiki.qt.io/jom \title jom */ @@ -102,11 +102,11 @@ */ /*! - \externalpage http://wiki.qt.io/?title=Qt_Localization + \externalpage http://wiki.qt.io/Qt_Localization \title external: Translating Qt Into Other Languages */ /*! - \externalpage http://wiki.qt.io/?title=BlackBerry + \externalpage http://wiki.qt.io/BlackBerry \title Qt for BlackBerry */ |