summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
Diffstat (limited to 'src/concurrent')
-rw-r--r--src/concurrent/doc/src/qtconcurrent-module.qdoc14
-rw-r--r--src/concurrent/qtconcurrentiteratekernel.h2
2 files changed, 16 insertions, 0 deletions
diff --git a/src/concurrent/doc/src/qtconcurrent-module.qdoc b/src/concurrent/doc/src/qtconcurrent-module.qdoc
index 37298017c7..d9cc953a05 100644
--- a/src/concurrent/doc/src/qtconcurrent-module.qdoc
+++ b/src/concurrent/doc/src/qtconcurrent-module.qdoc
@@ -36,3 +36,17 @@
The Qt Concurrent module extends the basic threading support found in \l{Qt Core} module and
simplifies the development of code that can be executed in parallel on all available CPU cores.
*/
+
+/*!
+ \typedef QtConcurrent::Exception
+ \obsolete
+
+ Use QException from \l{Qt Core} instead.
+*/
+
+/*!
+ \typedef QtConcurrent::UnhandledException
+ \obsolete
+
+ Use QUnhandledException from \l{Qt Core} instead.
+*/
diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h
index b47c30aef6..0969029e37 100644
--- a/src/concurrent/qtconcurrentiteratekernel.h
+++ b/src/concurrent/qtconcurrentiteratekernel.h
@@ -86,6 +86,8 @@ private:
Median<double> controlPartElapsed;
Median<double> userPartElapsed;
int m_blockSize;
+
+ Q_DISABLE_COPY(BlockSizeManager)
};
template <typename T>