diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
| commit | ce9519593a0b3deb99d1dd2529770f7e9fffef92 (patch) | |
| tree | c9bca05230dd68f49494240ae930bad1fe0c5956 /src/widgets/doc | |
| parent | 509f77cca28aa3edea5523c5869bae4412ed2ccc (diff) | |
| parent | 7baaec17edb06634f1d6235a55c7adbd112cba3e (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
mkspecs/android-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
src/gui/image/qimage_conversions.cpp
Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
Diffstat (limited to 'src/widgets/doc')
| -rw-r--r-- | src/widgets/doc/src/modelview.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/src/modelview.qdoc b/src/widgets/doc/src/modelview.qdoc index e3a569e8ac..2cdf724ae8 100644 --- a/src/widgets/doc/src/modelview.qdoc +++ b/src/widgets/doc/src/modelview.qdoc @@ -576,7 +576,7 @@ problem. Qt Labs provides software called - \l{http://wiki.qt.io/?title=Model_Test}{ModelTest}, + \l{http://wiki.qt.io/Model_Test}{ModelTest}, which checks models while your programming is running. Every time the model is changed, ModelTest scans the model and reports errors with an assert. This is especially important for tree models, since their hierarchical |