diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-17 08:34:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-17 08:34:13 (GMT) |
| commit | 7edbd71fb5399e73af170c62fff2bcd753bc6c55 (patch) | |
| tree | 66ee05fc66d30d575d429868ebce2b86a48f34f8 /tools | |
| parent | 0f8c867b1d5b13a56bd80f1819d4e71a9865b493 (diff) | |
| parent | e963a1365d495649a1c8930f4776c78781218881 (diff) | |
| download | Qt-7edbd71fb5399e73af170c62fff2bcd753bc6c55.zip Qt-7edbd71fb5399e73af170c62fff2bcd753bc6c55.tar.gz Qt-7edbd71fb5399e73af170c62fff2bcd753bc6c55.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Fixing typo
Fix possible missing glyphs in text when using GL engine
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/tools/assistant/helpenginewrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp index a53a9ee..748ad2c 100644 --- a/tools/assistant/tools/assistant/helpenginewrapper.cpp +++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp @@ -144,7 +144,7 @@ HelpEngineWrapper::HelpEngineWrapper(const QString &collectionFile) /* * Otherwise we will waste time if several new docs are found, - * because we will start to index them, only to be interupted + * because we will start to index them, only to be interrupted * by the next request. Also, there is a nasty SQLITE bug that will * cause the application to hang for minutes in that case. * This call is reverted by initalDocSetupDone(), which must be |