From c7d06095cb875bd9b0040020feab062aa9ab7a3a Mon Sep 17 00:00:00 2001 From: Rym Bouabid Date: Tue, 12 Sep 2023 13:34:35 +0200 Subject: [PATCH] Revamp Wait Conditions Example: Revisit the documentation Change the title. Remove the first \brief as there are two briefs in the document so that the new title makes sense with the second brief in "All Qt Examples" doc page. Task-number: QTBUG-108860 Change-Id: I1dec2ad107e3f9ff9b4203960ba54ae6d0d8c7b6 Reviewed-by: Ivan Solovev Reviewed-by: Jaishree Vyas (cherry picked from commit dcc08440567c1e5d36ba68a68a617182151f8bdc) --- examples/corelib/threads/doc/src/waitconditions.qdoc | 9 ++++----- src/corelib/kernel/qcoreapplication.cpp | 3 ++- src/corelib/thread/qthread.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/corelib/threads/doc/src/waitconditions.qdoc b/examples/corelib/threads/doc/src/waitconditions.qdoc index ae9e767c138..b840043f630 100644 --- a/examples/corelib/threads/doc/src/waitconditions.qdoc +++ b/examples/corelib/threads/doc/src/waitconditions.qdoc @@ -3,13 +3,12 @@ /*! \example threads/waitconditions - \title Wait Conditions Example - \brief Demonstrates multi-thread programming using Qt. + \title Producer and Consumer using Wait Conditions \ingroup qtconcurrent-mtexamples - \brief The Wait Conditions example shows how to use QWaitCondition and - QMutex to control access to a circular buffer shared by a - producer thread and a consumer thread. + \brief The Producer and Consumer using Wait Conditions example shows + how to use QWaitCondition and QMutex to control access to a circular + buffer shared by a producer thread and a consumer thread. The producer writes data to the buffer until it reaches the end of the buffer, at which point it restarts from the beginning, diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 003fe19d101..344830efda1 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -748,7 +748,8 @@ void QCoreApplicationPrivate::initLocale() to reset the locale that is used for number formatting to "C"-locale. \sa QGuiApplication, QAbstractEventDispatcher, QEventLoop, - {Producer and Consumer using Semaphores}, {Wait Conditions Example} + {Producer and Consumer using Semaphores}, + {Producer and Consumer using Wait Conditions} */ /*! diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index fb0f9bc234c..272d8a1e17b 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -289,7 +289,7 @@ QThreadPrivate::~QThreadPrivate() \sa {Thread Support in Qt}, QThreadStorage, {Synchronizing Threads}, Mandelbrot, {Producer and Consumer using Semaphores}, - {Wait Conditions Example} + {Producer and Consumer using Wait Conditions} */ /*!