diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-28 01:01:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-28 01:01:19 (GMT) |
| commit | bb8fcc568f63ea1ba2107ebbba3845073f378d94 (patch) | |
| tree | 83da43a476510c874c92110ccc72c18f7214e900 /tools/qdoc3/codechunk.h | |
| parent | 43697c982237f634f89ce661b1b363b8bfa383a7 (diff) | |
| parent | 59c58576efd3ceff7add46a359fd99e56a2fb279 (diff) | |
| download | Qt-bb8fcc568f63ea1ba2107ebbba3845073f378d94.zip Qt-bb8fcc568f63ea1ba2107ebbba3845073f378d94.tar.gz Qt-bb8fcc568f63ea1ba2107ebbba3845073f378d94.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/qml/qdeclarativeglobalscriptclass.cpp
Diffstat (limited to 'tools/qdoc3/codechunk.h')
| -rw-r--r-- | tools/qdoc3/codechunk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/codechunk.h b/tools/qdoc3/codechunk.h index e78873c..a0c554e 100644 --- a/tools/qdoc3/codechunk.h +++ b/tools/qdoc3/codechunk.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE /* The CodeChunk class represents a tiny piece of C++ code. - The class provides convertion between a list of lexemes and a string. It adds + The class provides conversion between a list of lexemes and a string. It adds spaces at the right place for consistent style. The tiny pieces of code it represents are data types, enum values, and default parameter values. |