diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 05:39:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 05:39:18 (GMT) |
| commit | ad957b76682dfddb2576154f56b5017680819eef (patch) | |
| tree | e12ae2d804b4775135851fd6a4d0db4d598519b8 /examples/qtconcurrent/progressdialog/main.cpp | |
| parent | 74871dc5730c8a44e71ee9efcf47f94384f36387 (diff) | |
| parent | 95e55e6bbfaf76166b64e7f57c612826afd19a86 (diff) | |
| download | Qt-ad957b76682dfddb2576154f56b5017680819eef.zip Qt-ad957b76682dfddb2576154f56b5017680819eef.tar.gz Qt-ad957b76682dfddb2576154f56b5017680819eef.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
typos fixed
Diffstat (limited to 'examples/qtconcurrent/progressdialog/main.cpp')
| -rw-r--r-- | examples/qtconcurrent/progressdialog/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp index 04a18dc..369d82c 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())); |