summaryrefslogtreecommitdiffstats
path: root/doc/src/development
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/development')
-rw-r--r--doc/src/development/qmake-manual.qdoc18
-rw-r--r--doc/src/development/qtestlib.qdoc8
2 files changed, 15 insertions, 11 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index b6b48bc..d6dc7d6 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -2665,6 +2665,13 @@
value of this variable is typically handled by \c qmake or
\l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+ \section1 QMAKE_LN_SHLIB
+
+ This variable contains the command to execute when creating a link
+ to a shared library. The
+ value of this variable is typically handled by \c qmake or
+ \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+
\section1 QMAKE_POST_LINK
This variable contains the command to execute after linking the TARGET
@@ -2679,12 +2686,13 @@
executed, additionally some backends will not support this - mostly only
Makefile backends.
- \section1 QMAKE_LN_SHLIB
+ \section1 QMAKE_PROJECT_NAME
- This variable contains the command to execute when creating a link
- to a shared library. The
- value of this variable is typically handled by \c qmake or
- \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+ \e {This is used for Visual Studio project files only.}
+
+ This variable determines the name of the project when generating project
+ files for IDEs. The default value is the target name. The value of this
+ variable is typically handled by \c qmake and rarely needs to be modified.
\section1 QMAKE_MAC_SDK
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 0c07747..a83c27e 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -88,10 +88,6 @@
\o Custom types can easily be added to the test data and test output.
\endtable
- Note: For higher-level GUI and application testing needs, please
- see the \l{Third-Party Tools}{Qt testing products provided by
- Nokia partners}.
-
\section1 QTestLib API
@@ -218,12 +214,12 @@
\section2 Creating a Benchmark
- To create a benchmark, follow the instructions for crating a test and then add a
+ To create a benchmark, follow the instructions for creating a test and then add a
QBENCHMARK macro to the test function that you want to benchmark.
\snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 12
- The code insde the QBENCHMARK macro will be measured, and possibly also repeated
+ The code inside the QBENCHMARK macro will be measured, and possibly also repeated
several times in order to get an accurate measurement. This depends on the selected
measurement back-end. Several back-ends are available. They can be selected on the
command line: