diff options
27 files changed, 36 insertions, 36 deletions
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp index 6f05158801..e279615632 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -680,7 +680,7 @@ inline QRandomGenerator::SystemGenerator &QRandomGenerator::SystemGenerator::sel position in the deterministic sequence as the \a other object was. Both objects will generate the same sequence from this point on. - For that reason, it is not adviseable to create a copy of + For that reason, it is not advisable to create a copy of QRandomGenerator::global(). If one needs an exclusive deterministic generator, consider instead using securelySeeded() to obtain a new object that shares no relationship with the QRandomGenerator::global(). diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index 4f4ef9e69b..9f1e281445 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -1199,7 +1199,7 @@ qint64 QAbstractFileEngine::readLine(char *data, qint64 maxlen) QIODevice can provide a faster implementation by making use of its internal buffer. For engines that already provide a fast readLine() implementation, returning false for this extension can avoid - unnnecessary double-buffering in QIODevice. + unnecessary double-buffering in QIODevice. \value MapExtension Whether the file engine provides the ability to map a file to memory. diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index acb0581976..ec82942310 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -1246,9 +1246,9 @@ QDir::Filters QDir::filter() const files that the application can read, write, or execute, and symlinks to such files/directories can be listed. - To retrieve the permissons for a directory, use the + To retrieve the permissions for a directory, use the entryInfoList() function to get the associated QFileInfo objects - and then use the QFileInfo::permissons() to obtain the permissions + and then use the QFileInfo::permissions() to obtain the permissions and ownership for each file. */ diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 8cdce03739..360557519d 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -1302,7 +1302,7 @@ QByteArray QIODevice::readAll() This function reads a line of ASCII characters from the device, up to a maximum of \a maxSize - 1 bytes, stores the characters in \a data, and returns the number of bytes read. If a line could not be - read but no error ocurred, this function returns 0. If an error + read but no error occurred, this function returns 0. If an error occurs, this function returns the length of what could be read, or -1 if nothing was read. diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index 96fe4919b0..60f9df9ec4 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -209,7 +209,7 @@ void QLoggingSettingsParser::setContent(QTextStream &stream) /*! \internal - Parses one line of the configuation file + Parses one line of the configuration file */ void QLoggingSettingsParser::parseNextLine(QStringView line) diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index cffb732650..73b650672b 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -659,7 +659,7 @@ bool QResource::isCompressed() const possible compression algorithm. If this function returns QResource::ZstdCompression, you need to use the - Zstandard library functios (\c{<zstd.h>} header). Qt does not provide a + Zstandard library functions (\c{<zstd.h>} header). Qt does not provide a wrapper. See \l{http://facebook.github.io/zstd/zstd_manual.html}{Zstandard manual}. diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index f759df74d4..fe54c84f6d 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE /*! \fn QBasicTimer::QBasicTimer() - Contructs a basic timer. + Constructs a basic timer. \sa start() */ diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 96a3be2863..6bfda65a68 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -250,7 +250,7 @@ QT_BEGIN_NAMESPACE \value WindowStateChange The \l{QWindow::windowState()}{window's state} (minimized, maximized or full-screen) has changed (QWindowStateChangeEvent). \value WindowTitleChange The window title has changed. \value WindowUnblocked The window is unblocked after a modal dialog exited. - \value WinIdChange The window system identifer for this native widget has changed. + \value WinIdChange The window system identifier for this native widget has changed. \value ZOrderChange The widget's z-order has changed. This event is never sent to top level windows. User events should have values between \c User and \c{MaxUser}: @@ -292,7 +292,7 @@ QT_BEGIN_NAMESPACE */ /*! - Contructs an event object of type \a type. + Constructs an event object of type \a type. */ QEvent::QEvent(Type type) : d(nullptr), t(type), posted(false), spont(false), m_accept(true) diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp index c65697ee0e..76a2e6dc13 100644 --- a/src/corelib/kernel/qdeadlinetimer.cpp +++ b/src/corelib/kernel/qdeadlinetimer.cpp @@ -891,7 +891,7 @@ QDeadlineTimer QDeadlineTimer::addNSecs(QDeadlineTimer dt, qint64 nsecs) noexcep \relates QDeadlineTimer Returns true if the deadline on \a d1 and the deadline in \a d2 are - diferent, false otherwise. The timer type used to create the two deadlines + different, false otherwise. The timer type used to create the two deadlines is ignored. This function is equivalent to: \snippet code/src_corelib_kernel_qdeadlinetimer.cpp 9 diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 40da8a3e4e..e4c3480095 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -3213,7 +3213,7 @@ QVariant QMetaProperty::read(const QObject *object) const If \a value is not of the same type type as the property, a conversion is attempted. An empty QVariant() is equivalent to a call to reset() - if this property is resetable, or setting a default-constructed object + if this property is resettable, or setting a default-constructed object otherwise. \sa read(), reset(), isWritable() diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 1dc61de850..a05ab1dfe3 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -1109,7 +1109,7 @@ void QTranslatorPrivate::clear() If \a n is not -1, it is used to choose an appropriate form for the translation (e.g. "%n file found" vs. "%n files found"). - If you need to programatically insert translations into a + If you need to programmatically insert translations into a QTranslator, this function can be reimplemented. \sa load() diff --git a/src/corelib/serialization/qcborcommon.cpp b/src/corelib/serialization/qcborcommon.cpp index d1a6faceff..093ffbc02e 100644 --- a/src/corelib/serialization/qcborcommon.cpp +++ b/src/corelib/serialization/qcborcommon.cpp @@ -145,7 +145,7 @@ QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st) \value PositiveBignum A positive number of arbitrary length, encoded as a byte array in network byte order. For example, the number 2\sup{64} is represented by a byte array containing the byte value 0x01 followed by 8 zero bytes. - \value NegativeBignum A negative number of arbirary length, encoded as the absolute value + \value NegativeBignum A negative number of arbitrary length, encoded as the absolute value of that number, minus one. For example, a byte array containing byte value 0x02 followed by 8 zero bytes represents the number -2\sup{65} - 1. @@ -230,7 +230,7 @@ QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st) element. \value UnexpectedBreak The CBOR stream contains a Break where it is not allowed (data is corrupt and the error is not recoverable). - \value UnknownType The CBOR stream contains an unknown/unparseable Type (data is corrupt + \value UnknownType The CBOR stream contains an unknown/unparsable Type (data is corrupt and the and the error is not recoverable). \value IllegalType The CBOR stream contains a known type in a position it is not allowed to exist (data is corrupt and the error is not recoverable). diff --git a/src/corelib/serialization/qcbormap.cpp b/src/corelib/serialization/qcbormap.cpp index 31d677b5e1..9ecdb1ef37 100644 --- a/src/corelib/serialization/qcbormap.cpp +++ b/src/corelib/serialization/qcbormap.cpp @@ -1591,7 +1591,7 @@ void QCborMap::detach(qsizetype reserved) /*! \fn QCborMap::ConstIterator::value_type QCborMap::ConstIterator::operator*() const - Returns a pair containing the curent item's key and value. + Returns a pair containing the current item's key and value. \sa key(), value() */ diff --git a/src/corelib/serialization/qcborstreamreader.cpp b/src/corelib/serialization/qcborstreamreader.cpp index 262aade4bf..22472afd1d 100644 --- a/src/corelib/serialization/qcborstreamreader.cpp +++ b/src/corelib/serialization/qcborstreamreader.cpp @@ -829,7 +829,7 @@ QCborStreamReader::QCborStreamReader(const QByteArray &data) Creates a QCborStreamReader object that will parse the CBOR stream found by reading from \a device. QCborStreamReader does not take ownership of \a - device, so it must remain valid until this oject is destroyed. + device, so it must remain valid until this object is destroyed. */ QCborStreamReader::QCborStreamReader(QIODevice *device) : d(new QCborStreamReaderPrivate(device)) diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index a2402f7515..df844be22e 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -138,9 +138,9 @@ QT_BEGIN_NAMESPACE \snippet code/src_corelib_io_qdatastream.cpp 4 You can select which byte order to use when serializing data. The - default setting is big endian (MSB first). Changing it to little - endian breaks the portability (unless the reader also changes to - little endian). We recommend keeping this setting unless you have + default setting is big-endian (MSB first). Changing it to little-endian + breaks the portability (unless the reader also changes to + little-endian). We recommend keeping this setting unless you have special requirements. \target raw @@ -513,7 +513,7 @@ void QDataStream::setStatus(Status status) The \a bo parameter can be QDataStream::BigEndian or QDataStream::LittleEndian. - The default setting is big endian. We recommend leaving this + The default setting is big-endian. We recommend leaving this setting unless you have special requirements. \sa byteOrder() diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index c8893b22c7..85a0ec7091 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -3473,7 +3473,7 @@ void QXmlStreamWriter::setAutoFormatting(bool enable) /*! \since 4.4 - Returns \c true if auto formattting is enabled, otherwise \c false. + Returns \c true if auto formatting is enabled, otherwise \c false. */ bool QXmlStreamWriter::autoFormatting() const { diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index ce1c8520bc..fea778685d 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -1274,7 +1274,7 @@ QByteArray &QByteArray::operator=(const char *str) functions that expect '\\0'-terminated strings. If the QByteArray object was created from a \l{fromRawData()}{raw data} that didn't include the trailing null-termination character then QByteArray doesn't add it - automaticall unless the \l{deep copy} is created. + automatically unless the \l{deep copy} is created. Example: \snippet code/src_corelib_tools_qbytearray.cpp 6 diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc index 49ac2a7852..0245fc9d56 100644 --- a/src/corelib/text/qlocale.qdoc +++ b/src/corelib/text/qlocale.qdoc @@ -1108,7 +1108,7 @@ \value MeasurementSystem a QLocale::MeasurementSystem enum specifying the measurement system \value AMText a string that represents the system AM designator associated with a 12-hour clock. \value PMText a string that represents the system PM designator associated with a 12-hour clock. - \value FirstDayOfWeek a Qt::DayOfWeek enum specifiying the first day of the week + \value FirstDayOfWeek a Qt::DayOfWeek enum specifying the first day of the week \value CurrencySymbol a string that represents a currency in a format QLocale::CurrencyFormat. \value CurrencyToString a localized string representation of a number with a currency symbol. Converts a QSystemLocale::CurrencyToStringArgument stored in the in variant to a QString. \value UILanguages a list of strings representing locale names that could be used for UI translation. diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 076725e19c..e6bc937d85 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -51,7 +51,7 @@ (QFuture::const_iterator). Using these iterators is another way to access results in the future. - QFuture also offers ways to interact with a runnning computation. For + QFuture also offers ways to interact with a running computation. For instance, the computation can be canceled with the cancel() function. To pause the computation, use the setPaused() function or one of the pause(), resume(), or togglePaused() convenience functions. Be aware that not all @@ -125,8 +125,8 @@ /*! \fn template <typename T> void QFuture<T>::cancel() Cancels the asynchronous computation represented by this future. Note that - the cancelation is asynchronous. Use waitForFinished() after calling - cancel() when you need synchronous cancelation. + the cancellation is asynchronous. Use waitForFinished() after calling + cancel() when you need synchronous cancellation. Results currently available may still be accessed on a canceled future, but new results will \e not become available after calling this function. diff --git a/src/corelib/thread/qfuturewatcher.cpp b/src/corelib/thread/qfuturewatcher.cpp index 7d789f5859..977658ab0a 100644 --- a/src/corelib/thread/qfuturewatcher.cpp +++ b/src/corelib/thread/qfuturewatcher.cpp @@ -114,8 +114,8 @@ QFutureWatcherBase::QFutureWatcherBase(QObject *parent) /*! \fn template <typename T> void QFutureWatcher<T>::cancel() Cancels the asynchronous computation represented by the future(). Note that - the cancelation is asynchronous. Use waitForFinished() after calling - cancel() when you need synchronous cancelation. + the cancellation is asynchronous. Use waitForFinished() after calling + cancel() when you need synchronous cancellation. Currently available results may still be accessed on a canceled QFuture, but new results will \e not become available after calling this function. diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp index 49d98b56fa..fad4d8143e 100644 --- a/src/corelib/thread/qsemaphore.cpp +++ b/src/corelib/thread/qsemaphore.cpp @@ -585,7 +585,7 @@ bool QSemaphore::tryAcquire(int n, int timeout) /*! \fn QSemaphoreReleaser::swap(QSemaphoreReleaser &other) - Exchanges the responsibilites of \c{*this} and \a other. + Exchanges the responsibilities of \c{*this} and \a other. Unlike move assignment, neither of the two objects ever releases its semaphore, if any, as a consequence of swapping. diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 0dcbadc098..abf51ea253 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -256,7 +256,7 @@ QThreadPrivate::~QThreadPrivate() \section1 Managing Threads - QThread will notifiy you via a signal when the thread is + QThread will notify you via a signal when the thread is started() and finished(), or you can use isFinished() and isRunning() to query the state of the thread. diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index 282119a5c5..7eb1e1fbce 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -417,7 +417,7 @@ void QThreadPoolPrivate::stealAndRunRunnable(QRunnable *runnable) \ingroup thread - QThreadPool manages and recyles individual QThread objects to help reduce + QThreadPool manages and recycles individual QThread objects to help reduce thread creation costs in programs that use threads. Each Qt application has one global QThreadPool object, which can be accessed by calling globalInstance(). diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp index 73494eabad..700bd62273 100644 --- a/src/corelib/thread/qthreadstorage.cpp +++ b/src/corelib/thread/qthreadstorage.cpp @@ -225,7 +225,7 @@ void QThreadStorageData::finish(void **p) The hasLocalData() function allows the programmer to determine if data has previously been set using the setLocalData() function. - This is also useful for lazy initializiation. + This is also useful for lazy initialization. If T is a pointer type, QThreadStorage takes ownership of the data (which must be created on the heap with \c new) and deletes it when diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 9d60fcf65c..ef343b2e67 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -4654,7 +4654,7 @@ QDateTime QDateTime::addSecs(qint64 s) const } /*! - Returns a QDateTime object containing a datetime \a msecs miliseconds + Returns a QDateTime object containing a datetime \a msecs milliseconds later than the datetime of this object (or earlier if \a msecs is negative). diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index b0e7c59e1e..0b876a38fb 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -1356,7 +1356,7 @@ QVector<QPointF> static inline tcbToBezier(const TCBPoints &tcbPoints) /*! Adds a segment of a TCB bezier spline to define a custom easing curve. It is only applicable if type() is QEasingCurve::TCBSpline. - The spline has to start explitly at (0.0, 0.0) and has to end at (1.0, 1.0) to + The spline has to start explicitly at (0.0, 0.0) and has to end at (1.0, 1.0) to be a valid easing curve. The tension \a t changes the length of the tangent vector. The continuity \a c changes the sharpness in change between the tangents. diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp index 696d0d016a..5d0d2fd52a 100644 --- a/src/corelib/tools/qversionnumber.cpp +++ b/src/corelib/tools/qversionnumber.cpp @@ -189,7 +189,7 @@ QVector<int> QVersionNumber::segments() const /*! \fn int QVersionNumber::segmentAt(int index) const - Returns the segement value at \a index. If the index does not exist, + Returns the segment value at \a index. If the index does not exist, returns 0. \sa segments(), segmentCount() |