diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/testlib | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/doc/src/qttestlib-manual.qdoc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc index 3acc08d8f4..56903d44bf 100644 --- a/src/testlib/doc/src/qttestlib-manual.qdoc +++ b/src/testlib/doc/src/qttestlib-manual.qdoc @@ -481,7 +481,6 @@ /*! \page qtest-tutorial.html \brief A short introduction to testing with Qt Test. - \contentspage Qt Test Overview \nextpage {Chapter 1: Writing a Unit Test}{Chapter 1} \ingroup best-practices @@ -506,7 +505,6 @@ /*! \example tutorial1 - \contentspage {Qt Test Tutorial}{Contents} \nextpage {Chapter 2: Data Driven Testing}{Chapter 2} \title Chapter 1: Writing a Unit Test @@ -582,7 +580,6 @@ \example tutorial2 \previouspage {Chapter 1: Writing a Unit Test}{Chapter 1} - \contentspage {Qt Test Tutorial}{Contents} \nextpage {Chapter 3: Simulating Gui Events}{Chapter 3} \title Chapter 2: Data Driven Testing @@ -691,7 +688,6 @@ \example tutorial3 \previouspage {Chapter 2: Data Driven Testing}{Chapter 2} - \contentspage {Qt Test Tutorial}{Contents} \nextpage {Chapter 4: Replaying GUI Events}{Chapter 4} \title Chapter 3: Simulating GUI Events @@ -752,7 +748,6 @@ \example tutorial4 \previouspage {Chapter 3: Simulating GUI Events}{Chapter 3} - \contentspage {Qt Test Tutorial}{Contents} \nextpage {Chapter 5: Writing a Benchmark}{Chapter 5} \title Chapter 4: Replaying GUI Events @@ -833,7 +828,6 @@ \example tutorial5 \previouspage {Chapter 4: Replaying GUI Events}{Chapter 4} - \contentspage {Qt Test Tutorial}{Contents} \nextpage {Chapter 6: Skipping Tests with QSKIP}{Chapter 6} \title Chapter 5: Writing a Benchmark @@ -889,7 +883,6 @@ \page qttestlib-tutorial6.html \previouspage {Chapter 5: Writing a Benchmark}{Chapter 5} - \contentspage {Qt Test Tutorial}{Contents} \title Chapter 6: Skipping Tests with QSKIP \brief How to skip tests in certain cases. |