diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 14:59:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 14:59:08 (GMT) |
| commit | d418a8336d610f9d8d4d1e75d55cadeec24eef7a (patch) | |
| tree | 5ff831e6ac944c4bedd49bec6ed111ed0be89c61 /src/activeqt/container/qaxbase.cpp | |
| parent | 99e1dc904eab4b38c90803f13d73f90b9c048920 (diff) | |
| parent | e581386148a9615ef6c11eb3ae6735d0fa9668f6 (diff) | |
| download | Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.zip Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.tar.gz Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added a missing \sa command, plus a \l in the text.
Improve the performance of the Anomaly browser demo
doc: Fixed typos.
Fixed QResource to respect the explicitely set locale
Change QHostInfo to use 5 parallel lookup threads
Doc: fix typo
fix Cocoa build
Diffstat (limited to 'src/activeqt/container/qaxbase.cpp')
| -rw-r--r-- | src/activeqt/container/qaxbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 3795f56..ed7ac29 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -909,7 +909,7 @@ QAxMetaObject *QAxBase::internalMetaObject() const \property QAxBase::control \brief the name of the COM object wrapped by this QAxBase object. - Setting this property initilializes the COM object. Any COM object + Setting this property initializes the COM object. Any COM object previously set is shut down. The most efficient way to set this property is by using the |