diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-03 17:04:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 17:07:37 +0100 |
| commit | c6be579a91c497d37e167155de243c6112f45db2 (patch) | |
| tree | afcbdcd862707d9cb1dcc75cd152ad31f647fd6d | |
| parent | 2e44efa5056355ac2c069ad2bd8a8ba6562f3eb6 (diff) | |
Fix some typos
Change-Id: I662e9b8fe644571fc7216a96f1dacfdc274a0e4c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | examples/activeqt/comapp/doc/src/comapp.qdoc | 2 | ||||
| -rw-r--r-- | src/activeqt/doc/src/activeqt-dumpcpp.qdoc | 2 | ||||
| -rw-r--r-- | src/activeqt/doc/src/qtaxcontainer.qdoc | 2 | ||||
| -rw-r--r-- | src/activeqt/doc/src/qtaxserver.qdoc | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/activeqt/comapp/doc/src/comapp.qdoc b/examples/activeqt/comapp/doc/src/comapp.qdoc index 9addb30..69b27b6 100644 --- a/examples/activeqt/comapp/doc/src/comapp.qdoc +++ b/examples/activeqt/comapp/doc/src/comapp.qdoc @@ -79,7 +79,7 @@ \snippet activeqt/comapp/main.cpp 6 The classes are exported from the server using the QAxFactory macros. Only \c Application objects can be instantiated from outside - the other APIs can - only be used after accessing the respective objects throught the \c Application + only be used after accessing the respective objects throughout the \c Application API. \snippet activeqt/comapp/main.cpp 7 diff --git a/src/activeqt/doc/src/activeqt-dumpcpp.qdoc b/src/activeqt/doc/src/activeqt-dumpcpp.qdoc index c300ec1..b803d8e 100644 --- a/src/activeqt/doc/src/activeqt-dumpcpp.qdoc +++ b/src/activeqt/doc/src/activeqt-dumpcpp.qdoc @@ -48,7 +48,7 @@ library ID, or a CLSID or ProgID for an object \row \li -o file - \li Writes the class declaration to \e {file}.h and meta object infomation to \e {file}.cpp + \li Writes the class declaration to \e {file}.h and meta object information to \e {file}.cpp \row \li -n namespace \li Generate a C++ namespace \e namespace diff --git a/src/activeqt/doc/src/qtaxcontainer.qdoc b/src/activeqt/doc/src/qtaxcontainer.qdoc index a50658f..5620aa8 100644 --- a/src/activeqt/doc/src/qtaxcontainer.qdoc +++ b/src/activeqt/doc/src/qtaxcontainer.qdoc @@ -246,7 +246,7 @@ \section3 Error calling IDispatch member: Type mismatch in parameter n A QAxBase::dynamicCall() failed - the function prototype was correct, - but the paramter at index \c n was of the wrong type and could + but the parameter at index \c n was of the wrong type and could not be coerced to the correct type. \section3 QAxScriptManager::call(): No script provides this function diff --git a/src/activeqt/doc/src/qtaxserver.qdoc b/src/activeqt/doc/src/qtaxserver.qdoc index 59e38ce..79acf5d 100644 --- a/src/activeqt/doc/src/qtaxserver.qdoc +++ b/src/activeqt/doc/src/qtaxserver.qdoc @@ -324,7 +324,7 @@ \li QPixmap \li IPictureDisp* \footnote - COM cannot marshal IPictureDisp accross process boundaries, + COM cannot marshal IPictureDisp across process boundaries, so QPixmap properties cannot be called for out-of-process servers. You can however marshal the image data via e.g. temporary files. See the Microsoft @@ -475,7 +475,7 @@ Any QObject subclass can be used as the type for a sub object in ActiveX, as long as it is known to the QAxFactory. Then the type can be used in properties, - or as the return type or paramter of a slot. + or as the return type or parameter of a slot. \section2 Property Notification @@ -527,7 +527,7 @@ \snippet doc_src_qaxserver.cpp 9 This is however not necessary as ActiveQt provides a default implementation - of a main function. The default implemenation calls QAxFactory::startServer(), + of a main function. The default implementation calls QAxFactory::startServer(), creates a QApplication instance and calls exec(). To build the ActiveX server executable run \c qmake |