summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-12-18 10:06:20 +0100
committerMartin Smith <msmith@trolltech.com>2009-12-18 10:06:20 +0100
commit371420d5f31a04b91c01807139d49e97db040bee (patch)
tree124e224172ee55cfcd99022cd9608703514fa89f
parent0236f6abce1d51eb5f42078b69b1d601e7224b1d (diff)
downloadqt4-tools-371420d5f31a04b91c01807139d49e97db040bee.tar.gz
doc: Fixed typos.
Task-number: QTBUG-6898
-rw-r--r--doc/src/qt4-intro.qdoc2
-rw-r--r--src/activeqt/container/qaxbase.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index fb1d0e42dc..a90544f797 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -549,7 +549,7 @@
the state machine, it is also easier to use the framework for
animating GUIs, for instance.
- See \l{The State Machine Framework} documentation for more infromation.
+ See \l{The State Machine Framework} documentation for more information.
\section1 Multi-Touch and Gestures
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 3795f569a8..ed7ac29175 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