Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	src/widgets/styles/qstylesheetstyle.cpp

Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regexp/tst_qsortfilterproxymodel_regexp.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regexp/tst_qsortfilterproxymodel_regexp.cpp
index e83738661e..38607f1378 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regexp/tst_qsortfilterproxymodel_regexp.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regexp/tst_qsortfilterproxymodel_regexp.cpp
@@ -37,6 +37,7 @@ public:
     tst_QSortFilterProxyModelRegExp();
 private slots:
     void tst_invalid();
+    void tst_caseSensitivity();
 };
 
 tst_QSortFilterProxyModelRegExp::tst_QSortFilterProxyModelRegExp() :
@@ -55,5 +56,14 @@ void tst_QSortFilterProxyModelRegExp::tst_invalid()
     QCOMPARE(model.filterRegExp(), QRegExp());
 }
 
+void tst_QSortFilterProxyModelRegExp::tst_caseSensitivity()
+{
+    const QLatin1String pattern("test");
+    QSortFilterProxyModel model;
+    model.setFilterCaseSensitivity(Qt::CaseInsensitive);
+    model.setFilterRegExp(pattern);
+    QCOMPARE(model.filterCaseSensitivity(), Qt::CaseInsensitive);
+}
+
 QTEST_MAIN(tst_QSortFilterProxyModelRegExp)
 #include "tst_qsortfilterproxymodel_regexp.moc"