diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:19:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 21:02:08 +0100 |
| commit | 34b14a8472f44f8517577756e033b92ebd4c5912 (patch) | |
| tree | 66a0575156d0a17a835430137e218e2b3f04cc65 /doc/global/externalsites/qt-webpages.qdoc | |
| parent | d34353a065c443aac20376cbd88323480d769183 (diff) | |
| parent | edd555425a08f9e074f0a4d9333862636ccaae8d (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
examples/xml/htmlinfo/simpleexample.html
examples/xml/rsslisting/rsslisting.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
src/3rdparty/harfbuzz-ng/src/hb-private.hh
src/corelib/global/qlogging.cpp
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/thread/qwaitcondition_unix.cpp
src/gui/kernel/qguiapplication.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
src/testlib/doc/src/qt-webpages.qdoc
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
Diffstat (limited to 'doc/global/externalsites/qt-webpages.qdoc')
| -rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index 870dd01923..888f1d6fe7 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -74,7 +74,7 @@ \title Livecoding video effects with Qt5 */ /*! - \externalpage http://blog.qt.digia.com/2012/02/29/pimp-my-video-shader-effects-and-multimedia/ + \externalpage http://blog.qt.io/2012/02/29/pimp-my-video-shader-effects-and-multimedia/ \title Pimp my video */ /*! @@ -92,12 +92,12 @@ */ /*! - \externalpage http://qt-project.org/doc/qt-4.8 + \externalpage http://doc.qt.io/qt-4.8 \title Qt 4.8 Reference Documentation */ /*! - \externalpage http://qt-project.org/doc/qt-4.8/qtquick.html + \externalpage http://doc.qt.io/qt-4.8/qtquick.html \title Qt Quick 1 Reference Documentation */ |