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

 Conflicts:
	qmake/generators/makefile.cpp
	qmake/generators/unix/unixmake2.cpp
	src/corelib/thread/qthread_unix.cpp
	tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp

Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 5b4761ba87..a576770811 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -852,8 +852,8 @@ void tst_QComboBox::autoCompletionCaseSensitivity()
     // case insensitive
     testWidget->clearEditText();
     QSignalSpy spyReturn(testWidget, SIGNAL(activated(int)));
-    testWidget->setAutoCompletionCaseSensitivity(Qt::CaseInsensitive);
-    QCOMPARE(testWidget->autoCompletionCaseSensitivity(), Qt::CaseInsensitive);
+    testWidget->completer()->setCaseSensitivity(Qt::CaseInsensitive);
+    QCOMPARE(testWidget->completer()->caseSensitivity(), Qt::CaseInsensitive);
 
     QTest::keyClick(testWidget->lineEdit(), Qt::Key_A);
     qApp->processEvents();
@@ -886,8 +886,8 @@ void tst_QComboBox::autoCompletionCaseSensitivity()
 
     // case sensitive
     testWidget->clearEditText();
-    testWidget->setAutoCompletionCaseSensitivity(Qt::CaseSensitive);
-    QCOMPARE(testWidget->autoCompletionCaseSensitivity(), Qt::CaseSensitive);
+    testWidget->completer()->setCaseSensitivity(Qt::CaseSensitive);
+    QCOMPARE(testWidget->completer()->caseSensitivity(), Qt::CaseSensitive);
     QTest::keyClick(testWidget->lineEdit(), Qt::Key_A);
     qApp->processEvents();
     QCOMPARE(testWidget->currentText(), QString("aww"));