summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qnamespace.qdoc73
-rw-r--r--src/corelib/io/qfileinfo.cpp7
-rw-r--r--src/corelib/kernel/qcore_unix.cpp2
-rw-r--r--src/corelib/kernel/qmath.cpp512
-rw-r--r--src/corelib/kernel/qobject.cpp2
-rw-r--r--src/corelib/thread/qreadwritelock.cpp6
6 files changed, 310 insertions, 292 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 9ef2101..871dd5c 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -514,45 +514,58 @@
/*!
\enum Qt::ConnectionType
- This enum describes the types of connection that can be used between signals and
- slots. In particular, it determines whether a particular signal is delivered to a
- slot immediately or queued for delivery at a later time.
+ This enum describes the types of connection that can be used
+ between signals and slots. In particular, it determines whether a
+ particular signal is delivered to a slot immediately or queued for
+ delivery at a later time.
+
+ \value AutoConnection
+ (default) Same as DirectConnection, if the emitter and
+ receiver are in the same thread. Same as QueuedConnection,
+ if the emitter and receiver are in different threads.
+
+ \value DirectConnection
+ The slot is invoked immediately, when the signal is
+ emitted.
+
+ \value QueuedConnection
+ The slot is invoked when control returns to the event loop
+ of the receiver's thread. The slot is executed in the
+ receiver's thread.
- \value DirectConnection When emitted, the signal is immediately delivered to the slot.
- \value QueuedConnection When emitted, the signal is queued until the event loop is
- able to deliver it to the slot.
\value BlockingQueuedConnection
- Same as QueuedConnection, except that the current thread blocks
- until the slot has been delivered. This connection type should
- only be used for receivers in a different thread. Note that misuse
- of this type can lead to deadlocks in your application.
- \value AutoConnection If the signal is emitted from the thread
- in which the receiving object lives, the
- slot is invoked directly, as with
- Qt::DirectConnection; otherwise the
- signal is queued, as with
- Qt::QueuedConnection.
- \value UniqueConnection Same as AutoConnection, but there will be a check that the signal is
- not already connected to the same slot before connecting, otherwise,
- the connection will fail.
- This value was introduced in Qt 4.6.
+ Same as QueuedConnection, except the current thread blocks
+ until the slot returns. This connection type should only be
+ used where the emitter and receiver are in different
+ threads. \note Violating this rule can cause your
+ application to deadlock.
+
+ \value UniqueConnection
+ Same as AutoConnection, but the connection is made only if
+ it does not duplicate an existing connection. i.e., if the
+ same signal is already connected to the same slot for the
+ same pair of objects, then the connection will fail. This
+ connection type was introduced in Qt 4.6.
+
\value AutoCompatConnection
- The default connection type for signals and slots when Qt 3 support
- is enabled. Equivalent to AutoConnection for connections but will cause warnings
- to be output under certain circumstances. See
- \l{Porting to Qt 4#Compatibility Signals and Slots}{Compatibility Signals and Slots}
- for further information.
+ The default type when Qt 3 support is enabled. Same as
+ AutoConnection but will also cause warnings to be output in
+ certain situations. See \l{Porting to Qt 4#Compatibility
+ Signals and Slots}{Compatibility Signals and Slots} for
+ further information.
- With queued connections, the parameters must be of types that are known to
- Qt's meta-object system, because Qt needs to copy the arguments to store them
- in an event behind the scenes. If you try to use a queued connection and
- get the error message
+ With queued connections, the parameters must be of types that are
+ known to Qt's meta-object system, because Qt needs to copy the
+ arguments to store them in an event behind the scenes. If you try
+ to use a queued connection and get the error message:
\snippet doc/src/snippets/code/doc_src_qnamespace.qdoc 0
- call qRegisterMetaType() to register the data type before you
+ Call qRegisterMetaType() to register the data type before you
establish the connection.
+ When using signals and slots with multiple threads, see \l{Signals and Slots Across Threads}.
+
\sa {Thread Support in Qt}, QObject::connect(), qRegisterMetaType()
*/
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index b4437db..e90529e 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -573,10 +573,13 @@ QString QFileInfo::canonicalFilePath() const
QString QFileInfo::absolutePath() const
{
Q_D(const QFileInfo);
- if (d->data->fileName.isEmpty())
+
+ if (!d->data->fileEngine) {
+ return QLatin1String("");
+ } else if (d->data->fileName.isEmpty()) {
qWarning("QFileInfo::absolutePath: Constructed with empty filename");
- if(!d->data->fileEngine)
return QLatin1String("");
+ }
return d->getFileName(QAbstractFileEngine::AbsolutePathName);
}
diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp
index 328fd3d..0fd965b 100644
--- a/src/corelib/kernel/qcore_unix.cpp
+++ b/src/corelib/kernel/qcore_unix.cpp
@@ -42,7 +42,9 @@
#include "qcore_unix_p.h"
#ifndef Q_OS_VXWORKS
+# if !defined(Q_OS_HPUX) || defined(__ia64)
# include <sys/select.h>
+# endif
# include <sys/time.h>
#else
# include <selectLib.h>
diff --git a/src/corelib/kernel/qmath.cpp b/src/corelib/kernel/qmath.cpp
index e89c1e6..a3586a4 100644
--- a/src/corelib/kernel/qmath.cpp
+++ b/src/corelib/kernel/qmath.cpp
@@ -44,262 +44,262 @@
QT_BEGIN_NAMESPACE
const qreal qt_sine_table[QT_SINE_TABLE_SIZE] = {
- 0.0,
- 0.024541228522912288,
- 0.049067674327418015,
- 0.073564563599667426,
- 0.098017140329560604,
- 0.1224106751992162,
- 0.14673047445536175,
- 0.17096188876030122,
- 0.19509032201612825,
- 0.2191012401568698,
- 0.24298017990326387,
- 0.26671275747489837,
- 0.29028467725446233,
- 0.31368174039889152,
- 0.33688985339222005,
- 0.35989503653498811,
- 0.38268343236508978,
- 0.40524131400498986,
- 0.42755509343028208,
- 0.44961132965460654,
- 0.47139673682599764,
- 0.49289819222978404,
- 0.51410274419322166,
- 0.53499761988709715,
- 0.55557023301960218,
- 0.57580819141784534,
- 0.59569930449243336,
- 0.61523159058062682,
- 0.63439328416364549,
- 0.65317284295377676,
- 0.67155895484701833,
- 0.68954054473706683,
- 0.70710678118654746,
- 0.72424708295146689,
- 0.74095112535495911,
- 0.75720884650648446,
- 0.77301045336273699,
- 0.78834642762660623,
- 0.80320753148064483,
- 0.81758481315158371,
- 0.83146961230254524,
- 0.84485356524970701,
- 0.85772861000027212,
- 0.87008699110871135,
- 0.88192126434835494,
- 0.89322430119551532,
- 0.90398929312344334,
- 0.91420975570353069,
- 0.92387953251128674,
- 0.93299279883473885,
- 0.94154406518302081,
- 0.94952818059303667,
- 0.95694033573220894,
- 0.96377606579543984,
- 0.97003125319454397,
- 0.97570213003852857,
- 0.98078528040323043,
- 0.98527764238894122,
- 0.98917650996478101,
- 0.99247953459870997,
- 0.99518472667219682,
- 0.99729045667869021,
- 0.99879545620517241,
- 0.99969881869620425,
- 1.0,
- 0.99969881869620425,
- 0.99879545620517241,
- 0.99729045667869021,
- 0.99518472667219693,
- 0.99247953459870997,
- 0.98917650996478101,
- 0.98527764238894122,
- 0.98078528040323043,
- 0.97570213003852857,
- 0.97003125319454397,
- 0.96377606579543984,
- 0.95694033573220894,
- 0.94952818059303667,
- 0.94154406518302081,
- 0.93299279883473885,
- 0.92387953251128674,
- 0.91420975570353069,
- 0.90398929312344345,
- 0.89322430119551521,
- 0.88192126434835505,
- 0.87008699110871146,
- 0.85772861000027212,
- 0.84485356524970723,
- 0.83146961230254546,
- 0.81758481315158371,
- 0.80320753148064494,
- 0.78834642762660634,
- 0.7730104533627371,
- 0.75720884650648468,
- 0.74095112535495899,
- 0.72424708295146689,
- 0.70710678118654757,
- 0.68954054473706705,
- 0.67155895484701855,
- 0.65317284295377664,
- 0.63439328416364549,
- 0.61523159058062693,
- 0.59569930449243347,
- 0.57580819141784545,
- 0.55557023301960218,
- 0.53499761988709715,
- 0.51410274419322177,
- 0.49289819222978415,
- 0.47139673682599786,
- 0.44961132965460687,
- 0.42755509343028203,
- 0.40524131400498992,
- 0.38268343236508989,
- 0.35989503653498833,
- 0.33688985339222033,
- 0.31368174039889141,
- 0.29028467725446239,
- 0.26671275747489848,
- 0.24298017990326407,
- 0.21910124015687005,
- 0.19509032201612861,
- 0.17096188876030122,
- 0.1467304744553618,
- 0.12241067519921635,
- 0.098017140329560826,
- 0.073564563599667732,
- 0.049067674327417966,
- 0.024541228522912326,
- 0.0,
- -0.02454122852291208,
- -0.049067674327417724,
- -0.073564563599667496,
- -0.09801714032956059,
- -0.1224106751992161,
- -0.14673047445536158,
- -0.17096188876030097,
- -0.19509032201612836,
- -0.2191012401568698,
- -0.24298017990326382,
- -0.26671275747489825,
- -0.29028467725446211,
- -0.31368174039889118,
- -0.33688985339222011,
- -0.35989503653498811,
- -0.38268343236508967,
- -0.40524131400498969,
- -0.42755509343028181,
- -0.44961132965460665,
- -0.47139673682599764,
- -0.49289819222978393,
- -0.51410274419322155,
- -0.53499761988709693,
- -0.55557023301960196,
- -0.57580819141784534,
- -0.59569930449243325,
- -0.61523159058062671,
- -0.63439328416364527,
- -0.65317284295377653,
- -0.67155895484701844,
- -0.68954054473706683,
- -0.70710678118654746,
- -0.72424708295146678,
- -0.74095112535495888,
- -0.75720884650648423,
- -0.77301045336273666,
- -0.78834642762660589,
- -0.80320753148064505,
- -0.81758481315158382,
- -0.83146961230254524,
- -0.84485356524970701,
- -0.85772861000027201,
- -0.87008699110871135,
- -0.88192126434835494,
- -0.89322430119551521,
- -0.90398929312344312,
- -0.91420975570353047,
- -0.92387953251128652,
- -0.93299279883473896,
- -0.94154406518302081,
- -0.94952818059303667,
- -0.95694033573220882,
- -0.96377606579543984,
- -0.97003125319454397,
- -0.97570213003852846,
- -0.98078528040323032,
- -0.98527764238894111,
- -0.9891765099647809,
- -0.99247953459871008,
- -0.99518472667219693,
- -0.99729045667869021,
- -0.99879545620517241,
- -0.99969881869620425,
- -1.0,
- -0.99969881869620425,
- -0.99879545620517241,
- -0.99729045667869021,
- -0.99518472667219693,
- -0.99247953459871008,
- -0.9891765099647809,
- -0.98527764238894122,
- -0.98078528040323043,
- -0.97570213003852857,
- -0.97003125319454397,
- -0.96377606579543995,
- -0.95694033573220894,
- -0.94952818059303679,
- -0.94154406518302092,
- -0.93299279883473907,
- -0.92387953251128663,
- -0.91420975570353058,
- -0.90398929312344334,
- -0.89322430119551532,
- -0.88192126434835505,
- -0.87008699110871146,
- -0.85772861000027223,
- -0.84485356524970723,
- -0.83146961230254546,
- -0.81758481315158404,
- -0.80320753148064528,
- -0.78834642762660612,
- -0.77301045336273688,
- -0.75720884650648457,
- -0.74095112535495911,
- -0.724247082951467,
- -0.70710678118654768,
- -0.68954054473706716,
- -0.67155895484701866,
- -0.65317284295377709,
- -0.63439328416364593,
- -0.61523159058062737,
- -0.59569930449243325,
- -0.57580819141784523,
- -0.55557023301960218,
- -0.53499761988709726,
- -0.51410274419322188,
- -0.49289819222978426,
- -0.47139673682599792,
- -0.44961132965460698,
- -0.42755509343028253,
- -0.40524131400499042,
- -0.38268343236509039,
- -0.359895036534988,
- -0.33688985339222,
- -0.31368174039889152,
- -0.2902846772544625,
- -0.26671275747489859,
- -0.24298017990326418,
- -0.21910124015687016,
- -0.19509032201612872,
- -0.17096188876030177,
- -0.14673047445536239,
- -0.12241067519921603,
- -0.098017140329560506,
- -0.073564563599667412,
- -0.049067674327418091,
- -0.024541228522912448
+ qreal(0.0),
+ qreal(0.024541228522912288),
+ qreal(0.049067674327418015),
+ qreal(0.073564563599667426),
+ qreal(0.098017140329560604),
+ qreal(0.1224106751992162),
+ qreal(0.14673047445536175),
+ qreal(0.17096188876030122),
+ qreal(0.19509032201612825),
+ qreal(0.2191012401568698),
+ qreal(0.24298017990326387),
+ qreal(0.26671275747489837),
+ qreal(0.29028467725446233),
+ qreal(0.31368174039889152),
+ qreal(0.33688985339222005),
+ qreal(0.35989503653498811),
+ qreal(0.38268343236508978),
+ qreal(0.40524131400498986),
+ qreal(0.42755509343028208),
+ qreal(0.44961132965460654),
+ qreal(0.47139673682599764),
+ qreal(0.49289819222978404),
+ qreal(0.51410274419322166),
+ qreal(0.53499761988709715),
+ qreal(0.55557023301960218),
+ qreal(0.57580819141784534),
+ qreal(0.59569930449243336),
+ qreal(0.61523159058062682),
+ qreal(0.63439328416364549),
+ qreal(0.65317284295377676),
+ qreal(0.67155895484701833),
+ qreal(0.68954054473706683),
+ qreal(0.70710678118654746),
+ qreal(0.72424708295146689),
+ qreal(0.74095112535495911),
+ qreal(0.75720884650648446),
+ qreal(0.77301045336273699),
+ qreal(0.78834642762660623),
+ qreal(0.80320753148064483),
+ qreal(0.81758481315158371),
+ qreal(0.83146961230254524),
+ qreal(0.84485356524970701),
+ qreal(0.85772861000027212),
+ qreal(0.87008699110871135),
+ qreal(0.88192126434835494),
+ qreal(0.89322430119551532),
+ qreal(0.90398929312344334),
+ qreal(0.91420975570353069),
+ qreal(0.92387953251128674),
+ qreal(0.93299279883473885),
+ qreal(0.94154406518302081),
+ qreal(0.94952818059303667),
+ qreal(0.95694033573220894),
+ qreal(0.96377606579543984),
+ qreal(0.97003125319454397),
+ qreal(0.97570213003852857),
+ qreal(0.98078528040323043),
+ qreal(0.98527764238894122),
+ qreal(0.98917650996478101),
+ qreal(0.99247953459870997),
+ qreal(0.99518472667219682),
+ qreal(0.99729045667869021),
+ qreal(0.99879545620517241),
+ qreal(0.99969881869620425),
+ qreal(1.0),
+ qreal(0.99969881869620425),
+ qreal(0.99879545620517241),
+ qreal(0.99729045667869021),
+ qreal(0.99518472667219693),
+ qreal(0.99247953459870997),
+ qreal(0.98917650996478101),
+ qreal(0.98527764238894122),
+ qreal(0.98078528040323043),
+ qreal(0.97570213003852857),
+ qreal(0.97003125319454397),
+ qreal(0.96377606579543984),
+ qreal(0.95694033573220894),
+ qreal(0.94952818059303667),
+ qreal(0.94154406518302081),
+ qreal(0.93299279883473885),
+ qreal(0.92387953251128674),
+ qreal(0.91420975570353069),
+ qreal(0.90398929312344345),
+ qreal(0.89322430119551521),
+ qreal(0.88192126434835505),
+ qreal(0.87008699110871146),
+ qreal(0.85772861000027212),
+ qreal(0.84485356524970723),
+ qreal(0.83146961230254546),
+ qreal(0.81758481315158371),
+ qreal(0.80320753148064494),
+ qreal(0.78834642762660634),
+ qreal(0.7730104533627371),
+ qreal(0.75720884650648468),
+ qreal(0.74095112535495899),
+ qreal(0.72424708295146689),
+ qreal(0.70710678118654757),
+ qreal(0.68954054473706705),
+ qreal(0.67155895484701855),
+ qreal(0.65317284295377664),
+ qreal(0.63439328416364549),
+ qreal(0.61523159058062693),
+ qreal(0.59569930449243347),
+ qreal(0.57580819141784545),
+ qreal(0.55557023301960218),
+ qreal(0.53499761988709715),
+ qreal(0.51410274419322177),
+ qreal(0.49289819222978415),
+ qreal(0.47139673682599786),
+ qreal(0.44961132965460687),
+ qreal(0.42755509343028203),
+ qreal(0.40524131400498992),
+ qreal(0.38268343236508989),
+ qreal(0.35989503653498833),
+ qreal(0.33688985339222033),
+ qreal(0.31368174039889141),
+ qreal(0.29028467725446239),
+ qreal(0.26671275747489848),
+ qreal(0.24298017990326407),
+ qreal(0.21910124015687005),
+ qreal(0.19509032201612861),
+ qreal(0.17096188876030122),
+ qreal(0.1467304744553618),
+ qreal(0.12241067519921635),
+ qreal(0.098017140329560826),
+ qreal(0.073564563599667732),
+ qreal(0.049067674327417966),
+ qreal(0.024541228522912326),
+ qreal(0.0),
+ qreal(-0.02454122852291208),
+ qreal(-0.049067674327417724),
+ qreal(-0.073564563599667496),
+ qreal(-0.09801714032956059),
+ qreal(-0.1224106751992161),
+ qreal(-0.14673047445536158),
+ qreal(-0.17096188876030097),
+ qreal(-0.19509032201612836),
+ qreal(-0.2191012401568698),
+ qreal(-0.24298017990326382),
+ qreal(-0.26671275747489825),
+ qreal(-0.29028467725446211),
+ qreal(-0.31368174039889118),
+ qreal(-0.33688985339222011),
+ qreal(-0.35989503653498811),
+ qreal(-0.38268343236508967),
+ qreal(-0.40524131400498969),
+ qreal(-0.42755509343028181),
+ qreal(-0.44961132965460665),
+ qreal(-0.47139673682599764),
+ qreal(-0.49289819222978393),
+ qreal(-0.51410274419322155),
+ qreal(-0.53499761988709693),
+ qreal(-0.55557023301960196),
+ qreal(-0.57580819141784534),
+ qreal(-0.59569930449243325),
+ qreal(-0.61523159058062671),
+ qreal(-0.63439328416364527),
+ qreal(-0.65317284295377653),
+ qreal(-0.67155895484701844),
+ qreal(-0.68954054473706683),
+ qreal(-0.70710678118654746),
+ qreal(-0.72424708295146678),
+ qreal(-0.74095112535495888),
+ qreal(-0.75720884650648423),
+ qreal(-0.77301045336273666),
+ qreal(-0.78834642762660589),
+ qreal(-0.80320753148064505),
+ qreal(-0.81758481315158382),
+ qreal(-0.83146961230254524),
+ qreal(-0.84485356524970701),
+ qreal(-0.85772861000027201),
+ qreal(-0.87008699110871135),
+ qreal(-0.88192126434835494),
+ qreal(-0.89322430119551521),
+ qreal(-0.90398929312344312),
+ qreal(-0.91420975570353047),
+ qreal(-0.92387953251128652),
+ qreal(-0.93299279883473896),
+ qreal(-0.94154406518302081),
+ qreal(-0.94952818059303667),
+ qreal(-0.95694033573220882),
+ qreal(-0.96377606579543984),
+ qreal(-0.97003125319454397),
+ qreal(-0.97570213003852846),
+ qreal(-0.98078528040323032),
+ qreal(-0.98527764238894111),
+ qreal(-0.9891765099647809),
+ qreal(-0.99247953459871008),
+ qreal(-0.99518472667219693),
+ qreal(-0.99729045667869021),
+ qreal(-0.99879545620517241),
+ qreal(-0.99969881869620425),
+ qreal(-1.0),
+ qreal(-0.99969881869620425),
+ qreal(-0.99879545620517241),
+ qreal(-0.99729045667869021),
+ qreal(-0.99518472667219693),
+ qreal(-0.99247953459871008),
+ qreal(-0.9891765099647809),
+ qreal(-0.98527764238894122),
+ qreal(-0.98078528040323043),
+ qreal(-0.97570213003852857),
+ qreal(-0.97003125319454397),
+ qreal(-0.96377606579543995),
+ qreal(-0.95694033573220894),
+ qreal(-0.94952818059303679),
+ qreal(-0.94154406518302092),
+ qreal(-0.93299279883473907),
+ qreal(-0.92387953251128663),
+ qreal(-0.91420975570353058),
+ qreal(-0.90398929312344334),
+ qreal(-0.89322430119551532),
+ qreal(-0.88192126434835505),
+ qreal(-0.87008699110871146),
+ qreal(-0.85772861000027223),
+ qreal(-0.84485356524970723),
+ qreal(-0.83146961230254546),
+ qreal(-0.81758481315158404),
+ qreal(-0.80320753148064528),
+ qreal(-0.78834642762660612),
+ qreal(-0.77301045336273688),
+ qreal(-0.75720884650648457),
+ qreal(-0.74095112535495911),
+ qreal(-0.724247082951467),
+ qreal(-0.70710678118654768),
+ qreal(-0.68954054473706716),
+ qreal(-0.67155895484701866),
+ qreal(-0.65317284295377709),
+ qreal(-0.63439328416364593),
+ qreal(-0.61523159058062737),
+ qreal(-0.59569930449243325),
+ qreal(-0.57580819141784523),
+ qreal(-0.55557023301960218),
+ qreal(-0.53499761988709726),
+ qreal(-0.51410274419322188),
+ qreal(-0.49289819222978426),
+ qreal(-0.47139673682599792),
+ qreal(-0.44961132965460698),
+ qreal(-0.42755509343028253),
+ qreal(-0.40524131400499042),
+ qreal(-0.38268343236509039),
+ qreal(-0.359895036534988),
+ qreal(-0.33688985339222),
+ qreal(-0.31368174039889152),
+ qreal(-0.2902846772544625),
+ qreal(-0.26671275747489859),
+ qreal(-0.24298017990326418),
+ qreal(-0.21910124015687016),
+ qreal(-0.19509032201612872),
+ qreal(-0.17096188876030177),
+ qreal(-0.14673047445536239),
+ qreal(-0.12241067519921603),
+ qreal(-0.098017140329560506),
+ qreal(-0.073564563599667412),
+ qreal(-0.049067674327418091),
+ qreal(-0.024541228522912448)
};
QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 3564a35..8346fe4 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2456,7 +2456,7 @@ int QObject::receivers(const char *signal) const
If you pass the Qt::UniqueConnection \a type, the connection will only
be made if it is not a duplicate. If there is already a duplicate
(exact same signal to the exact same slot on the same objects),
- the connection will fail and connect will return false
+ the connection will fail and connect will return false.
The optional \a type parameter describes the type of connection
to establish. In particular, it determines whether a particular
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index 3463eab..bd07a97 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE
Like QMutex, a QReadWriteLock can be recursively locked by the
same thread when constructed in
- \l{QReadWriteLock::RecursionMode}recursive mode}. In such cases,
+ \l{QReadWriteLock::RecursionMode}. In such cases,
unlock() must be called the same number of times lockForWrite() or
lockForRead() was called. Note that the lock type cannot be
changed when trying to lock recursively, i.e. it is not possible
@@ -266,12 +266,12 @@ bool QReadWriteLock::tryLockForRead(int timeout)
return true;
}
- /*!
+/*!
Locks the lock for writing. This function will block the current
thread if another thread has locked for reading or writing.
\sa unlock() lockForRead() tryLockForWrite()
- */
+*/
void QReadWriteLock::lockForWrite()
{
QMutexLocker lock(&d->mutex);
generated by cgit v0.12 at 2025-08-20 11:30:05 (GMT)