diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
commit | 6239af6f0f15871e02a516c97c5f1775743d352b (patch) | |
tree | 904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /examples/qtconcurrent | |
parent | 3dc47622a469ded1c99397fdedc2053b73d57189 (diff) | |
parent | 6654a05fcad565a302e205e7f7deaa0b2757082d (diff) |
Merge branch 'release' into stable
Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
Diffstat (limited to 'examples/qtconcurrent')
6 files changed, 7 insertions, 5 deletions
diff --git a/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc b/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc index ef6173ef1d..6d7c39526d 100644 --- a/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc +++ b/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/imagescaling + \example imagescaling \title Image Scaling Example \brief Demonstrates how to asynchronously scale images. \ingroup qtconcurrentexamples diff --git a/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc b/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc index fa0ab43059..43c27bd98f 100644 --- a/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc +++ b/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/map + \example map \title Map Example \brief Demonstrates how to scale images synchronously. \ingroup qtconcurrentexamples diff --git a/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc b/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc index a2eec5ab40..109bb73bdb 100644 --- a/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc +++ b/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/progressdialog + \example progressdialog \title QtConcurrent Progress Dialog Example \brief Demonstrates how to monitor the progress of the active processes. \ingroup qtconcurrentexamples diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index dafbabb5c3..1df6f2d8cf 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(concurrent)) + TEMPLATE = subdirs SUBDIRS = imagescaling \ map \ diff --git a/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc b/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc index 8ff4d2cef7..0f36dcbd6d 100644 --- a/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc +++ b/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/runfunction + \example runfunction \title Run Function Example \brief Demonstrates how to run standard functions concurrently. \ingroup qtconcurrentexamples diff --git a/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc b/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc index d5b6b93cb5..b45524ca7c 100644 --- a/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc +++ b/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/wordcount + \example wordcount \title QtConcurrent Word Count Example \brief Demonstrates how to use the map-reduce algorithm \ingroup qtconcurrentexamples |