diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
commit | ce9519593a0b3deb99d1dd2529770f7e9fffef92 (patch) | |
tree | c9bca05230dd68f49494240ae930bad1fe0c5956 /doc/global/externalsites | |
parent | 509f77cca28aa3edea5523c5869bae4412ed2ccc (diff) | |
parent | 7baaec17edb06634f1d6235a55c7adbd112cba3e (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
mkspecs/android-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
src/gui/image/qimage_conversions.cpp
Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
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 */ |