diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-19 23:00:13 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-19 23:00:13 (GMT) |
| commit | bcba1271a09c48e0bfd5477dd6cf0955ba55b077 (patch) | |
| tree | 528bc50c5f98b98bd3ad34b0e8f92cc33e73877d /src/plugins | |
| parent | 2530a8b70da9b172ccd041a347f2556c3140c147 (diff) | |
| parent | 0cfa6daa4776cd78370e644fae3005ae432b83c7 (diff) | |
| download | Qt-bcba1271a09c48e0bfd5477dd6cf0955ba55b077.zip Qt-bcba1271a09c48e0bfd5477dd6cf0955ba55b077.tar.gz Qt-bcba1271a09c48e0bfd5477dd6cf0955ba55b077.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/symbian/symbianengine.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp index 33fa508..f025d86 100644 --- a/src/plugins/bearer/symbian/symbianengine.cpp +++ b/src/plugins/bearer/symbian/symbianengine.cpp @@ -981,7 +981,7 @@ void SymbianEngine::RunL() QMutexLocker locker(&mutex); if (iStatus != KErrCancel) { - // By default, start relistening notifications. Stop only if interesting event occured. + // By default, start relistening notifications. Stop only if interesting event occurred. iWaitingCommsDatabaseNotifications = true; RDbNotifier::TEvent event = STATIC_CAST(RDbNotifier::TEvent, iStatus.Int()); switch (event) { diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index 063af13..507f70b 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -83,7 +83,7 @@ QWindowSurface* QMeeGoGraphicsSystem::createWindowSurface(QWidget *widget) const QPixmapData *QMeeGoGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const { // Long story short: without this it's possible to hit an - // unitialized paintDevice due to a Qt bug too complex to even + // uninitialized paintDevice due to a Qt bug too complex to even // explain here... not to mention fix without going crazy. // MDK QGLShareContextScope ctx(qt_gl_share_widget()->context()); |