diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 8 | ||||
| -rw-r--r-- | doc/src/development/qtestlib.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/examples/googlesuggest.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/porting/porting4.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/porting/qt4-network.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/scripting/scripting.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_porting4.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/widgets-and-layouts/styles.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/widgets-and-layouts/stylesheet.qdoc | 2 |
9 files changed, 15 insertions, 15 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) diff --git a/doc/src/examples/googlesuggest.qdoc b/doc/src/examples/googlesuggest.qdoc index cd6c6b1..f2bdb4f 100644 --- a/doc/src/examples/googlesuggest.qdoc +++ b/doc/src/examples/googlesuggest.qdoc @@ -111,7 +111,7 @@ event processing. Key event handling is implemented so that Enter and Return execute the - selected link, while the Escape key hides the popup. Sine we want to be + selected link, while the Escape key hides the popup. Since we want to be able to navigate the list of suggestions using the different navigation keys on the keyboard we let Qt continue regular event processing for those by returning false from the eventFilter reimplementation. diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc index d494b0c..68e6119 100644 --- a/doc/src/porting/porting4.qdoc +++ b/doc/src/porting/porting4.qdoc @@ -3201,8 +3201,8 @@ The \c QShared class has been obsoleted by the more powerful QSharedData and QSharedDataPointer as a means of creating custom - implicitly shared classes. It has been renamed Q3Shared moved to - the Qt3Support library. + implicitly shared classes. It has been renamed Q3Shared and moved + to the Qt3Support library. An easy way of porting to Qt 4 is to include this class into your project and to use it instead of \c QShared: @@ -3226,7 +3226,7 @@ \section1 QSimpleRichText QSimpleRichText has been obsoleted by QTextDocument. It has - bene renamed Q3SimpleRichText and moved to the Qt3Support + been renamed Q3SimpleRichText and moved to the Qt3Support library. Previously, you would do the following with Q3SimpleRichText: diff --git a/doc/src/porting/qt4-network.qdoc b/doc/src/porting/qt4-network.qdoc index 91c1c4e..60e6dbb 100644 --- a/doc/src/porting/qt4-network.qdoc +++ b/doc/src/porting/qt4-network.qdoc @@ -199,7 +199,7 @@ level QNetworkProtocol and QUrlOperator abstraction has been eliminated. These classes attempted the impossible (unify FTP and HTTP under one roof), and unsurprisingly failed at that. Qt 4 - still provides QFtp, and it also proveds the QNetworkAccessManager. + still provides QFtp, and it also provides the QNetworkAccessManager. The QSocket class in Qt 3 has been renamed QTcpSocket. The new class is reentrant and supports blocking. It's also easier to diff --git a/doc/src/scripting/scripting.qdoc b/doc/src/scripting/scripting.qdoc index edee52a..2c22989 100644 --- a/doc/src/scripting/scripting.qdoc +++ b/doc/src/scripting/scripting.qdoc @@ -1007,7 +1007,7 @@ Because of the presence of the built-in \c arguments object, implementing functions that take a variable number of arguments is simple. In fact, as we have seen, in the technical sense \e{all} - Qt Script functions can be seen as variable-argument functions). + Qt Script functions can be seen as variable-argument functions. As an example, consider a concat() function that takes an arbitrary number of arguments, converts the arguments to their string representation and concatenates the results; for example, diff --git a/doc/src/snippets/code/doc_src_porting4.qdoc b/doc/src/snippets/code/doc_src_porting4.qdoc index 4d24ba3..2f76591 100644 --- a/doc/src/snippets/code/doc_src_porting4.qdoc +++ b/doc/src/snippets/code/doc_src_porting4.qdoc @@ -452,7 +452,7 @@ QSimpleRichText richText(text, font); // Set the width of the paragraph to w richText.setWidth(w); -// Or set a resonable default size +// Or set a reasonable default size richText.adjustSize(); // Query for its used size diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc index b7f7322..9a28715 100644 --- a/doc/src/widgets-and-layouts/styles.qdoc +++ b/doc/src/widgets-and-layouts/styles.qdoc @@ -125,7 +125,7 @@ necessary for drawing. Thanks to QStyleOption, it is possible to make QStyle draw widgets without linking in any code for the widget. This makes it possible to use \l{QStyle}'s draw functions on any paint - device. Ie you can draw a combobox on any widget, not just on a + device, i.e., you can draw a combobox on any widget, not just on a QComboBox. The widget is passed as the last argument in case the style needs diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc index ebe67df..5f42f28 100644 --- a/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -3822,7 +3822,7 @@ The tear indicator and the scroll buttons can be further customized as follows: \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 148 - Sine Qt 4.6 the close button can be customized as follow: + Since Qt 4.6 the close button can be customized as follow: \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 159 \section2 Customizing QTableView |