diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:07:02 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-29 14:08:49 +0200 |
| commit | 189dc655bbb3b4f9e1e11596f5a0f4682326066d (patch) | |
| tree | 67527f791542775394332c2995887994bde9adc9 /src/corelib/doc/src/custom-types.qdoc | |
| parent | 6fd5870df0fbad0187b6d8bf7e3b12afb2e7a66f (diff) | |
| parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/image/qimage.cpp
src/gui/image/qppmhandler.cpp
src/gui/kernel/qguiapplication.cpp
src/gui/painting/qpaintengine_raster.cpp
Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765
Diffstat (limited to 'src/corelib/doc/src/custom-types.qdoc')
| -rw-r--r-- | src/corelib/doc/src/custom-types.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/doc/src/custom-types.qdoc b/src/corelib/doc/src/custom-types.qdoc index ed846aee83..bac4a90829 100644 --- a/src/corelib/doc/src/custom-types.qdoc +++ b/src/corelib/doc/src/custom-types.qdoc @@ -147,7 +147,7 @@ The output sent to the debug stream can, of course, be made as simple or as complicated as you like. Note that the value returned by this function is the QDebug object itself, though this is often obtained by calling the - maybeSpace() member function of QDebug that pads out the stream with space + \l{QDebug::}{maybeSpace()} member function of QDebug that pads out the stream with space characters to make it more readable. \section1 Further Reading |