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 /examples/network/doc/src/network-download.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 'examples/network/doc/src/network-download.qdoc')
| -rw-r--r-- | examples/network/doc/src/network-download.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/doc/src/network-download.qdoc b/examples/network/doc/src/network-download.qdoc index 212252e7c9..60a6fab3c4 100644 --- a/examples/network/doc/src/network-download.qdoc +++ b/examples/network/doc/src/network-download.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example network/download + \example download \title Network Download Example \brief Demonstrates how to use networking APIs for multiple downloads \ingroup examples-network |