diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-07 01:00:20 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-07 01:00:21 +0200 |
commit | 295cd87c6d4cb6c9c1222fc565031377e5f33704 (patch) | |
tree | 31296727d5fed266d5d894d57827c139cb555108 /src/testlib | |
parent | 35ebdeb83eb4057f5e50042747b13d0772051459 (diff) | |
parent | 3bac18da8ef9f5750207ddf47192b5db3137c4ac (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I66c7f18a2abd13601da0947919436f7da3549ae9
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/doc/src/qttest-index.qdoc | 2 | ||||
-rw-r--r-- | src/testlib/doc/src/qttest.qdoc | 2 | ||||
-rw-r--r-- | src/testlib/doc/src/qttestlib-manual.qdoc | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/testlib/doc/src/qttest-index.qdoc b/src/testlib/doc/src/qttest-index.qdoc index b3c2be7375..8c817b3653 100644 --- a/src/testlib/doc/src/qttest-index.qdoc +++ b/src/testlib/doc/src/qttest-index.qdoc @@ -41,9 +41,11 @@ \snippet code/doc_src_qttest.cpp 0 + \if !define(qtforpython) To link against Qt Test, add this line to the project file: \snippet code/doc_src_qttest.pro 1 + \endif \section1 Articles and Guides diff --git a/src/testlib/doc/src/qttest.qdoc b/src/testlib/doc/src/qttest.qdoc index 696111f2f3..e61fd71e69 100644 --- a/src/testlib/doc/src/qttest.qdoc +++ b/src/testlib/doc/src/qttest.qdoc @@ -42,10 +42,12 @@ \snippet code/doc_src_qttest.cpp 0 + \if !defined(qtforpython) To link against the module, add this line to your \l qmake \c .pro file: \snippet code/doc_src_qttest.pro 1 + \endif See \l{Qt Test Overview} for an introduction on how to use Qt's unit testing features with your applications. diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc index 9c6bdf60a4..71b4541313 100644 --- a/src/testlib/doc/src/qttestlib-manual.qdoc +++ b/src/testlib/doc/src/qttestlib-manual.qdoc @@ -109,6 +109,7 @@ For more examples, refer to the \l{Qt Test Tutorial}. + \if !defined(qtforpython) \section1 Building a Test If you are using \c qmake as your build tool, just add the @@ -132,6 +133,7 @@ See \l {Chapter 1: Writing a Unit Test}{Writing a Unit Test} for a step by step explanation. + \endif \section1 Qt Test Command Line Arguments |