diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 13 | ||||
| -rw-r--r-- | src/corelib/kernel/qfunctions_winrt.h | 8 | ||||
| -rw-r--r-- | src/corelib/tools/qlist.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qvector.cpp | 2 |
5 files changed, 8 insertions, 19 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index c14f774bd6..bc93b1f477 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -3458,7 +3458,7 @@ Q_GLOBAL_STATIC(AndroidRandomStorage, randomTLS) pseudo random integers to be returned by qrand(). The sequence of random numbers generated is deterministic per thread. For example, - if two threads call qsrand(1) and subsequently calls qrand(), the threads will get + if two threads call qsrand(1) and subsequently call qrand(), the threads will get the same random number sequence. \sa qrand() diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 86c38839d2..4156040471 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1756,17 +1756,6 @@ \value Key_Zoom \value Key_Exit \value Key_Cancel - \value Key_MicVolumeUp - \value Key_Find - \value Key_Open - \value Key_MicVolumeDown - \value Key_New - \value Key_Settings - \value Key_Redo - \value Key_Exit - \value Key_Info - \value Key_Undo - \value Key_Guide \sa QKeyEvent::key() */ @@ -2299,7 +2288,7 @@ \enum Qt::ItemSelectionMode This enum is used in QGraphicsItem, QGraphicsScene and QGraphicsView to - specify how items are selected, or how to determine if a shapes and items + specify how items are selected, or how to determine if shapes and items collide. \value ContainsItemShape The output list contains only items whose diff --git a/src/corelib/kernel/qfunctions_winrt.h b/src/corelib/kernel/qfunctions_winrt.h index e0777b8df8..9b33f8b120 100644 --- a/src/corelib/kernel/qfunctions_winrt.h +++ b/src/corelib/kernel/qfunctions_winrt.h @@ -180,7 +180,7 @@ static inline HRESULT _await_impl(const Microsoft::WRL::ComPtr<T> &asyncOp, Awai t.start(); switch (awaitStyle) { case ProcessMainThreadEvents: - while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == Started) { + while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) { QCoreApplication::processEvents(); if (timeout && t.hasExpired(timeout)) return ERROR_TIMEOUT; @@ -188,7 +188,7 @@ static inline HRESULT _await_impl(const Microsoft::WRL::ComPtr<T> &asyncOp, Awai break; case ProcessThreadEvents: if (QAbstractEventDispatcher *dispatcher = QThread::currentThread()->eventDispatcher()) { - while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == Started) { + while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) { dispatcher->processEvents(QEventLoop::AllEvents); if (timeout && t.hasExpired(timeout)) return ERROR_TIMEOUT; @@ -198,7 +198,7 @@ static inline HRESULT _await_impl(const Microsoft::WRL::ComPtr<T> &asyncOp, Awai // fall through default: case YieldThread: - while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == Started) { + while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) { QThread::yieldCurrentThread(); if (timeout && t.hasExpired(timeout)) return ERROR_TIMEOUT; @@ -206,7 +206,7 @@ static inline HRESULT _await_impl(const Microsoft::WRL::ComPtr<T> &asyncOp, Awai break; } - if (FAILED(hr) || status != Completed) { + if (FAILED(hr) || status != AsyncStatus::Completed) { HRESULT ec; hr = asyncInfo->get_ErrorCode(&ec); if (FAILED(hr)) diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 1762da2c8f..5f26e704c4 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -370,7 +370,7 @@ void **QListData::erase(void **xi) application must interface with a C API. \note Iterators into a QLinkedList and references into - heap-allocating QLists remain valid long as the referenced items + heap-allocating QLists remain valid as long as the referenced items remain in the container. This is not true for iterators and references into a QVector and non-heap-allocating QLists. diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp index ef1c9c17b0..0ea47b1a1a 100644 --- a/src/corelib/tools/qvector.cpp +++ b/src/corelib/tools/qvector.cpp @@ -77,7 +77,7 @@ application must interface with a C API. \note Iterators into a QLinkedList and references into - heap-allocating QLists remain valid long as the referenced items + heap-allocating QLists remain valid as long as the referenced items remain in the container. This is not true for iterators and references into a QVector and non-heap-allocating QLists. |