diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-07-30 00:33:37 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-07-30 00:33:37 (GMT) |
| commit | 96dc38a1a971b2bb9d62d440943a3d0b2e44fb0c (patch) | |
| tree | 6e8f0b0b125d0f03529cb0fb07f686d34c6b7daf /src/corelib/concurrent/qtconcurrentexception.cpp | |
| parent | 829833e16644beab6077d07ad80f3a2b148f4e41 (diff) | |
| parent | 597a842d66dc04181bfd063863216acbb11ce3bc (diff) | |
| download | Qt-96dc38a1a971b2bb9d62d440943a3d0b2e44fb0c.zip Qt-96dc38a1a971b2bb9d62d440943a3d0b2e44fb0c.tar.gz Qt-96dc38a1a971b2bb9d62d440943a3d0b2e44fb0c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentexception.cpp')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentexception.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qtconcurrentexception.cpp b/src/corelib/concurrent/qtconcurrentexception.cpp index e7f4674..fad04a6 100644 --- a/src/corelib/concurrent/qtconcurrentexception.cpp +++ b/src/corelib/concurrent/qtconcurrentexception.cpp @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE the Qt Concurrent functions will throw a QtConcurrent::UnhandledException in the receiver thread. - When using QFuture, transferred exceptions willl be thrown when calling the following functions: + When using QFuture, transferred exceptions will be thrown when calling the following functions: \list \o QFuture::waitForFinished() \o QFuture::result() |