diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-12 07:12:25 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-12 07:12:25 (GMT) |
| commit | 224d8f7619447a4784da533ac26760ea1e7b9087 (patch) | |
| tree | 5407614135100025a375acf049ace2074e3e6f11 /src/tools/moc/moc.cpp | |
| parent | e7a19af4430b45f371bb33120f0ed39a2c83b733 (diff) | |
| parent | add9c43407a63c28f1107b9a77e74f6f62593246 (diff) | |
| download | Qt-224d8f7619447a4784da533ac26760ea1e7b9087.zip Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.gz Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/tools/moc/moc.cpp')
| -rw-r--r-- | src/tools/moc/moc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 84d1567..ac49d65 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -1211,7 +1211,7 @@ bool Moc::until(Token target) { //when searching commas within the default argument, we should take care of template depth (anglecount) // unfortunatelly, we do not have enough semantic information to know if '<' is the operator< or - // the begining of a template type. so we just use heuristics. + // the beginning of a template type. so we just use heuristics. int possible = -1; while (index < symbols.size()) { |