diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 17:57:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 17:57:02 (GMT) |
| commit | 0cfa6daa4776cd78370e644fae3005ae432b83c7 (patch) | |
| tree | 477925717dbd19a94f1763c0e14a66f75cfeb91f /tools/assistant | |
| parent | d11e18b654de3c9e36455b5d6447a9d6273a6e2a (diff) | |
| parent | c82ba87a0e8e416099e95898386ea25c790c3da3 (diff) | |
| download | Qt-0cfa6daa4776cd78370e644fae3005ae432b83c7.zip Qt-0cfa6daa4776cd78370e644fae3005ae432b83c7.tar.gz Qt-0cfa6daa4776cd78370e644fae3005ae432b83c7.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 raster engine glyph cache
Fix possible corrupted text when gl glyph cache becomes full
Check correctly before including SSE4.2 header.
Fixed crash when destroying QGLWidget
Prevent crash in GL 2 engine when stroking null rectangle.
Compile fix.
Documentation update for new switching events.
Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
Doc: Fixing typo
Fix possible missing glyphs in text when using GL engine
Diffstat (limited to 'tools/assistant')
| -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 |