diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-29 15:10:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-29 15:10:39 (GMT) |
| commit | 12e5d8897fbd60def1dd38608c1cd3f0d1d4317b (patch) | |
| tree | e3193ee6947a112818e4a00adb54bc598ed142f5 /src/corelib/concurrent/qtconcurrentexception.cpp | |
| parent | 65642dd343bf61510117cd7e13f69e7138247932 (diff) | |
| parent | 5bdb85e3b21bcf624eb1830aa32d027e0c6870fe (diff) | |
| download | Qt-12e5d8897fbd60def1dd38608c1cd3f0d1d4317b.zip Qt-12e5d8897fbd60def1dd38608c1cd3f0d1d4317b.tar.gz Qt-12e5d8897fbd60def1dd38608c1cd3f0d1d4317b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed spelling mistakes in documented functions, classes, etc. Part of QTBUG-11938 and QTBUG-10801
Fix compilation with QT_NO_TEXTCODEC
Fix compilation with QT_NO_XMLSTREAMREADER
Fix compilation - disable TextInput when QT_NO_LINEEDIT is defined
fixes for using freetds
fix epic fail from 4ba6646
Added *_location variables to pkg-config files for rcc, lupdate and lrelease
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() |