diff options
author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-07-07 20:39:30 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-07-07 20:39:30 +0200 |
commit | 95e55e6bbfaf76166b64e7f57c612826afd19a86 (patch) | |
tree | 4927a51db9b0f2643d94eec7ccb8b7e35e3f5878 | |
parent | a985ed3b8f891f10abf99e5ef7756ca16a020d57 (diff) | |
download | qt4-tools-95e55e6bbfaf76166b64e7f57c612826afd19a86.tar.gz |
typos fixed
Reviewed-by: TrustMe
-rw-r--r-- | examples/qtconcurrent/progressdialog/main.cpp | 2 | ||||
-rw-r--r-- | src/corelib/concurrent/qtconcurrentmap.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp index 04a18dcf55..369d82cd6a 100644 --- a/examples/qtconcurrent/progressdialog/main.cpp +++ b/examples/qtconcurrent/progressdialog/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char **argv) QProgressDialog dialog; dialog.setLabelText(QString("Progressing using %1 thread(s)...").arg(QThread::idealThreadCount())); - // Create a QFutureWatcher and conncect signals and slots. + // Create a QFutureWatcher and connect signals and slots. QFutureWatcher<void> futureWatcher; QObject::connect(&futureWatcher, SIGNAL(finished()), &dialog, SLOT(reset())); QObject::connect(&dialog, SIGNAL(canceled()), &futureWatcher, SLOT(cancel())); diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp index 39a13fb663..e74d69c5e4 100644 --- a/src/corelib/concurrent/qtconcurrentmap.cpp +++ b/src/corelib/concurrent/qtconcurrentmap.cpp @@ -70,7 +70,7 @@ \value UnorderedReduce Reduction is done in an arbitrary order. \value OrderedReduce Reduction is done in the order of the original sequence. - \value SequentialReduce Reduction is done sequentally: only one + \value SequentialReduce Reduction is done sequentially: only one thread will enter the reduce function at a time. (Parallel reduction might be supported in a future version of Qt Concurrent.) */ |