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 /src/activeqt/doc/src/qtaxserver.qdoc | |
| parent | 2e44efa5056355ac2c069ad2bd8a8ba6562f3eb6 (diff) | |
Fix some typos
Change-Id: I662e9b8fe644571fc7216a96f1dacfdc274a0e4c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/activeqt/doc/src/qtaxserver.qdoc')
| -rw-r--r-- | src/activeqt/doc/src/qtaxserver.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
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 |