diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-14 12:36:58 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-14 12:36:58 (GMT) |
| commit | 7769e7bf79f0c17a01874fa0b3f1b227c1e41e93 (patch) | |
| tree | e69de39b2e33323b8213d0d7e7469bd33d9fb60e /tools/porting/src/rpp.cpp | |
| parent | 6cd8a6001fe87107d32524c6115d37b620d3e108 (diff) | |
| parent | 8399cce50eb11db885e67a52055505951309cae8 (diff) | |
| download | Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.zip Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.gz Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.bz2 | |
Merge branch '4.7' of ../qt-doc-team into 4.7
Diffstat (limited to 'tools/porting/src/rpp.cpp')
| -rw-r--r-- | tools/porting/src/rpp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/porting/src/rpp.cpp b/tools/porting/src/rpp.cpp index 7b0bea1..2e2aa97 100644 --- a/tools/porting/src/rpp.cpp +++ b/tools/porting/src/rpp.cpp @@ -60,7 +60,7 @@ Source *Preprocessor::parse(const TokenEngine::TokenContainer &tokenContainer, const QVector<Type> &tokenTypeList, TypedPool<Item> *memoryPool) { m_memoryPool = memoryPool; - Source *m_source = createNode<Source>(m_memoryPool); //node whith no parent + Source *m_source = createNode<Source>(m_memoryPool); //node with no parent m_tokenContainer = tokenContainer; m_tokenTypeList = tokenTypeList; lexerTokenIndex = 0; @@ -538,7 +538,7 @@ bool Preprocessor::parsePragmaDirective(Item *group) } /* Reads a preprocessor line from the source by advancing lexerTokenIndex and - returing a TokenSection containg the read line. Text lines separated by + returning a TokenSection containing the read line. Text lines separated by an escaped newline are joined. */ TokenSection Preprocessor::readLine() |