diff options
author | Martin Smith <msmith@trolltech.com> | 2010-02-12 09:50:57 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-02-12 09:50:57 (GMT) |
commit | 826066dbe5f298ec0515d21fa182d15ee3762f37 (patch) | |
tree | 5fcda73d5765ebd879076f165829d746180c2fd9 /doc/src/development | |
parent | 01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2 (diff) | |
download | Qt-826066dbe5f298ec0515d21fa182d15ee3762f37.zip Qt-826066dbe5f298ec0515d21fa182d15ee3762f37.tar.gz Qt-826066dbe5f298ec0515d21fa182d15ee3762f37.tar.bz2 |
doc: Fixed several typos.
Task: QTBUG-7997
Diffstat (limited to 'doc/src/development')
-rw-r--r-- | doc/src/development/qmake-manual.qdoc | 8 | ||||
-rw-r--r-- | doc/src/development/qtestlib.qdoc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 49e1e71..78dfefa 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -858,7 +858,7 @@ libraries are linked in the "Frameworks & Libraries" phase in the XCode build system. - Furthermore, The selected "Active Build Configuration" is stored + Furthermore, the selected "Active Build Configuration" is stored in a .pbxuser file, which is generated by xcode on first load, not created by qmake. @@ -979,7 +979,7 @@ If \c UID2 is not specified, it defaults to the same value as \c UID3. If \c UID3 is not specified, qmake will automatically generate a \c UID3 suitable for development and debugging. This value should be manually - specified for applications that are to be released. In order to optain + specified for applications that are to be released. In order to obtain an official UID, please contact Nokia. Both \c SID and \c VID default to empty values. For more information about unique identifiers and their meaning for @@ -3504,7 +3504,7 @@ For example: \target Properties \section1 Properties - \c qmake has a system of persistant information, this allows you to + \c qmake has a system of persistent information, this allows you to \c set a variable in qmake once, and each time qmake is invoked this value can be queried. Use the following to set a property in qmake: @@ -3682,7 +3682,7 @@ For example: the newly introduced libraries in the \c LIBS variable, and find their dependent .prl files, continuing until all libraries have been resolved. At this point, the Makefile is created as usual, and the libraries are - linked explicitlyy against the application. + linked explicitly against the application. The internals of the .prl file are left closed so they can easily change later. They are not designed to be changed by hand, should only diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index 0835ff1..4b9c657 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -237,14 +237,14 @@ The code insde 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 an can be selected on the + measurement back-end. Several back-ends are available. They can be selected on the command line: \target testlib-benchmarking-measurement \table \header \o Name - \o Commmand-line Arguemnt + \o Commmand-line Argument \o Availability \row \o Walltime \o (default) |