Merge remote-tracking branch 'gerrit/master' into newdocs

Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640

3 files changed, 23 insertions, 1 deletions

diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
index 7f3e2295b2..85ee7144c9 100644
--- a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
@@ -357,7 +357,7 @@ void tst_QDataWidgetMapper::comboBox()
     readWriteBox.addItem("read write item 1");
     readWriteBox.addItem("read write item 2");
 
-    // populat the combo boxes with data
+    // populate the combo boxes with data
     mapper.addMapping(&readOnlyBox, 0, "currentIndex");
     mapper.addMapping(&readWriteBox, 1, "currentText");
     mapper.toFirst();
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 9f3cd0a3e1..8458ca78fb 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -55,6 +55,11 @@
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QDialog>
 #include <QtWidgets/QStyledItemDelegate>
+
+#if !defined(QT_NO_STYLE_WINDOWS)
+#include <qwindowsstyle.h>
+#endif // QT_NO_STYLE_WINDOWS
+
 #if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
 #  include <windows.h>
 #  include <QtGui/QGuiApplication>
@@ -2190,6 +2195,11 @@ void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys()
 
     // create listview
     QListView lv;
+#if !defined(QT_NO_STYLE_WINDOWS)
+    // The test fails on Fusion style
+    // See https://bugreports.qt-project.org/browse/QTBUG-27675
+    lv.setStyle(new QWindowsStyle());
+#endif
     lv.setFlow(static_cast<QListView::Flow>(flow));
     lv.setSpacing(spacing);
     lv.setModel(&model);
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 2fbd90a3fe..2bccb03845 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -199,6 +199,7 @@ private slots:
     void task234926_setHeaderSorting();
 
     void changeHeaderData();
+    void viewOptions();
 };
 
 // Testing get/set functions
@@ -477,6 +478,10 @@ public:
         return QTableView::sizeHintForRow(row);
     }
 
+    QStyleOptionViewItem viewOptions() const {
+        return QTableView::viewOptions();
+    }
+
     bool checkSignalOrder;
 public slots:
     void currentChanged(QModelIndex , QModelIndex ) {
@@ -4074,5 +4079,12 @@ void tst_QTableView::taskQTBUG_10169_sizeHintForRow()
     QCOMPARE(orderedHeight, reorderedHeight);
 }
 
+void tst_QTableView::viewOptions()
+{
+    QtTestTableView view;
+    QStyleOptionViewItem options = view.viewOptions();
+    QVERIFY(options.showDecorationSelected);
+}
+
 QTEST_MAIN(tst_QTableView)
 #include "tst_qtableview.moc"