aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2017-05-31 09:43:15 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2017-05-31 07:50:03 +0000
commit43ee03f3eec7ad25eb83e074b0fa8f14db63927c (patch)
treee5a42c8f8df6d0d9a201f8129a7834695fb2b398 /doc
parentec0ce2b853f81fea7e7aef37752efdfafbb163f7 (diff)
Doc: Reflect changes made to Auto Test Project wizard
Change-Id: I0e1fedf2d2ecbc85c2c589b73a709780511833c8 Task-number: QTCREATORBUG-18283 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/howto/creator-autotest.qdoc20
1 files changed, 9 insertions, 11 deletions
diff --git a/doc/src/howto/creator-autotest.qdoc b/doc/src/howto/creator-autotest.qdoc
index b4cebaaac2..bdeb94cc87 100644
--- a/doc/src/howto/creator-autotest.qdoc
+++ b/doc/src/howto/creator-autotest.qdoc
@@ -49,7 +49,7 @@
\list 1
\li Select \uicontrol File > \uicontrol {New File or Project} >
- \uicontrol {Other Project} > \uicontrol {Auto Test} >
+ \uicontrol {Other Project} > \uicontrol {Auto Test Project} >
\uicontrol Choose to create a project with boilerplate code for a
Qt test.
@@ -76,10 +76,9 @@
executed by the testing framework to initialize and clean
up the test.
- \li In the \uicontrol {Build auto tests} field, select
- \uicontrol Always to always build the test when building
- the project or \uicontrol {Debug Only} to only build it
- during debug builds.
+ \li In the \uicontrol {Build system} field, select the build
+ system to use for building the project: qmake, CMake, or
+ Qbs.
\endlist
@@ -95,7 +94,7 @@
\list 1
\li Select \uicontrol File > \uicontrol {New File or Project} >
- \uicontrol {Other Project} > \uicontrol {Auto Test} >
+ \uicontrol {Other Project} > \uicontrol {Auto Test Project} >
\uicontrol Choose to create a project with boilerplate code for a
Google test.
@@ -116,11 +115,6 @@
\li Select the \uicontrol {Enable C++ 11} check box to
support C++ 11 features in the test.
- \li In the \uicontrol {Build auto tests} field, select
- \uicontrol Always to always build the test when building
- the project or \uicontrol {Debug Only} to only build it
- during debug builds.
-
\li In the \uicontrol {Google test repository} field, select
a directory that contains a clone of the googletest
repository.
@@ -128,6 +122,10 @@
To use an installed Google C++ Testing framework instead,
see \l{Setting Up the Google C++ Testing Framework}.
+ \li In the \uicontrol {Build system} field, select the build
+ system to use for building the project: qmake, CMake, or
+ Qbs.
+
\endlist
\endlist