diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc | |
parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
parent | 281121697340084f7d385eab530f41916789b94d (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc')
-rw-r--r-- | src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc index a2e851293c..d707c77cfb 100644 --- a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc @@ -269,7 +269,7 @@ library.} It is provided to keep old source code working. We strongly advise against using it in new code. See the \l - {http://doc.qt.digia.com/4.0/porting4.html} {Porting + {http://doc.qt.io/qt-4.8/porting4.html} {Porting Guide} for more information. \endquotation |