Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev

4 files changed, 13 insertions, 3 deletions

diff --git a/src/widgets/doc/src/graphicsview.qdoc b/src/widgets/doc/src/graphicsview.qdoc
index 148b4ea47d..d1d8630935 100644
--- a/src/widgets/doc/src/graphicsview.qdoc
+++ b/src/widgets/doc/src/graphicsview.qdoc
@@ -301,7 +301,7 @@
           pass a QPainterPath to mapToScene(), and then pass the mapped path
           to QGraphicsScene::items().
 
-          You can map coordinates and shapes to and from and item's scene by
+          You can map coordinates and shapes to and from an item's scene by
           calling QGraphicsItem::mapToScene() and
           QGraphicsItem::mapFromScene(). You can also map to an item's parent
           item by calling QGraphicsItem::mapToParent() and
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index 1f954d67dd..f376583f55 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -1325,6 +1325,11 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     \fn void QListWidget::removeItemWidget(QListWidgetItem *item)
 
     Removes the widget set on the given \a item.
+
+    To remove an item (row) from the list entirely, either delete the item or
+    use takeItem().
+
+    \sa itemWidget(), setItemWidget()
 */
 
 /*!
@@ -1620,6 +1625,8 @@ void QListWidget::closePersistentEditor(QListWidgetItem *item)
     \since 4.1
 
     Returns the widget displayed in the given \a item.
+
+    \sa setItemWidget(), removeItemWidget()
 */
 QWidget *QListWidget::itemWidget(QListWidgetItem *item) const
 {
@@ -1638,7 +1645,7 @@ QWidget *QListWidget::itemWidget(QListWidgetItem *item) const
     implement a custom editor widget, use QListView and subclass QItemDelegate
     instead.
 
-    \sa {Delegate Classes}
+    \sa itemWidget(), removeItemWidget(), {Delegate Classes}
 */
 void QListWidget::setItemWidget(QListWidgetItem *item, QWidget *widget)
 {
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 94fcee4553..6329c52caa 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -4004,6 +4004,9 @@ void QApplication::alert(QWidget *widget, int duration)
 
     We recommend that widgets do not cache this value as it may change at any
     time if the user changes the global desktop settings.
+
+    \note This property may hold a negative value, for instance if cursor
+    blinking is disabled.
 */
 void QApplication::setCursorFlashTime(int msecs)
 {
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index 1f70dd719b..b927004773 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -1474,7 +1474,7 @@ void QWidgetLineControl::setCursorBlinkPeriod(int msec)
     if (m_blinkTimer) {
         killTimer(m_blinkTimer);
     }
-    if (msec && !m_readOnly) {
+    if (msec > 0 && !m_readOnly) {
         m_blinkTimer = startTimer(msec / 2);
         m_blinkStatus = 1;
     } else {