diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
| commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
| tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /doc/global/externalsites/qch-urls.qdoc | |
| parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
| parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'doc/global/externalsites/qch-urls.qdoc')
| -rw-r--r-- | doc/global/externalsites/qch-urls.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/global/externalsites/qch-urls.qdoc b/doc/global/externalsites/qch-urls.qdoc index e099669dd6..f8ff8df7a0 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://doc.qt.digia.com/qtcreator/index.html + \externalpage http://qt-project.org/doc/qtcreator \title external: Qt Creator Manual */ /*! @@ -90,6 +90,6 @@ \title external: Qt Mobility Examples */ /*! - \externalpage http://doc-snapshot.qt-project.org/qtcreator-2.6/creator-overview.html + \externalpage http://qt-project.org/doc/qtcreator/creator-overview.html \title external: Qt Creator Overview */ |