Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 111 insertions, 2 deletions

diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp
index 7408fe4..46d78c4 100644
--- a/tests/auto/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/qcompleter/tst_qcompleter.cpp
@@ -102,6 +102,8 @@ public:
     ~tst_QCompleter();
 
 private slots:
+    void getSetCheck();
+
     void multipleWidgets();
     void focusIn();
 
@@ -146,6 +148,8 @@ private slots:
     void task253125_lineEditCompletion_data();
     void task253125_lineEditCompletion();
 
+    void task247560_keyboardNavigation();
+
 private:
     void filter();
     void testRowCount();
@@ -266,6 +270,72 @@ void tst_QCompleter::filter()
     QCOMPARE(completer->currentCompletion(), completionText);
 }
 
+// Testing get/set functions
+void tst_QCompleter::getSetCheck()
+{
+    QStandardItemModel model(3,3);
+    QCompleter completer(&model);
+
+    // QString QCompleter::completionPrefix()
+    // void QCompleter::setCompletionPrefix(QString)
+    completer.setCompletionPrefix(QString("te"));
+    QCOMPARE(completer.completionPrefix(), QString("te"));
+    completer.setCompletionPrefix(QString());
+    QCOMPARE(completer.completionPrefix(), QString());
+
+    // ModelSorting QCompleter::modelSorting()
+    // void QCompleter::setModelSorting(ModelSorting)
+    completer.setModelSorting(QCompleter::CaseSensitivelySortedModel);
+    QCOMPARE(completer.modelSorting(), QCompleter::CaseSensitivelySortedModel);
+    completer.setModelSorting(QCompleter::CaseInsensitivelySortedModel);
+    QCOMPARE(completer.modelSorting(), QCompleter::CaseInsensitivelySortedModel);
+    completer.setModelSorting(QCompleter::UnsortedModel);
+    QCOMPARE(completer.modelSorting(), QCompleter::UnsortedModel);
+
+    // CompletionMode QCompleter::completionMode()
+    // void QCompleter::setCompletionMode(CompletionMode)
+    QCOMPARE(completer.completionMode(), QCompleter::PopupCompletion); // default value
+    completer.setCompletionMode(QCompleter::UnfilteredPopupCompletion);
+    QCOMPARE(completer.completionMode(), QCompleter::UnfilteredPopupCompletion);
+    completer.setCompletionMode(QCompleter::InlineCompletion);
+    QCOMPARE(completer.completionMode(), QCompleter::InlineCompletion);
+
+    // int QCompleter::completionColumn()
+    // void QCompleter::setCompletionColumn(int)
+    completer.setCompletionColumn(2);
+    QCOMPARE(completer.completionColumn(), 2);
+    completer.setCompletionColumn(1);
+    QCOMPARE(completer.completionColumn(), 1);
+
+    // int QCompleter::completionRole()
+    // void QCompleter::setCompletionRole(int)
+    QCOMPARE(completer.completionRole(), static_cast<int>(Qt::EditRole)); // default value
+    completer.setCompletionRole(Qt::DisplayRole);
+    QCOMPARE(completer.completionRole(), static_cast<int>(Qt::DisplayRole));
+
+    // int QCompleter::maxVisibleItems()
+    // void QCompleter::setMaxVisibleItems(int)
+    QCOMPARE(completer.maxVisibleItems(), 7); // default value
+    completer.setMaxVisibleItems(10);
+    QCOMPARE(completer.maxVisibleItems(), 10);
+    QTest::ignoreMessage(QtWarningMsg, "QCompleter::setMaxVisibleItems: "
+                         "Invalid max visible items (-2147483648) must be >= 0");
+    completer.setMaxVisibleItems(INT_MIN);
+    QCOMPARE(completer.maxVisibleItems(), 10); // Cannot be set to something negative => old value
+
+    // Qt::CaseSensitivity QCompleter::caseSensitivity()
+    // void QCompleter::setCaseSensitivity(Qt::CaseSensitivity)
+    QCOMPARE(completer.caseSensitivity(), Qt::CaseSensitive); // default value
+    completer.setCaseSensitivity(Qt::CaseInsensitive);
+    QCOMPARE(completer.caseSensitivity(), Qt::CaseInsensitive);
+
+    // bool QCompleter::wrapAround()
+    // void QCompleter::setWrapAround(bool)
+    QCOMPARE(completer.wrapAround(), true); // default value
+    completer.setWrapAround(false);
+    QCOMPARE(completer.wrapAround(), false);
+}
+
 void tst_QCompleter::csMatchingOnCsSortedModel_data()
 {
     delete completer;
@@ -955,7 +1025,7 @@ void tst_QCompleter::multipleWidgets()
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&window);
 #endif
-    QTest::qWait(5000);
+    QTest::qWait(50);
     QTRY_VERIFY(qApp->focusWidget() == comboBox);
     comboBox->lineEdit()->setText("it");
     QCOMPARE(comboBox->currentText(), QString("it")); // should not complete with setText
@@ -968,7 +1038,8 @@ void tst_QCompleter::multipleWidgets()
     lineEdit->setCompleter(&completer);
     lineEdit->show();
     lineEdit->setFocus();
-    QTest::qWait(5000);
+    QTest::qWait(50);
+    QTRY_VERIFY(qApp->focusWidget() == lineEdit);
     lineEdit->setText("it");
     QCOMPARE(lineEdit->text(), QString("it")); // should not completer with setText
     QCOMPARE(comboBox->currentText(), QString("")); // combo box text must not change!
@@ -1233,5 +1304,43 @@ void tst_QCompleter::task253125_lineEditCompletion()
     QCOMPARE(edit.text(), QString("iota"));
 }
 
+void tst_QCompleter::task247560_keyboardNavigation()
+{
+    QStandardItemModel model;
+
+    for (int i = 0; i < 5; i++) {
+        for (int j = 0; j < 5; j++) {
+            model.setItem(i, j, new QStandardItem(QString("row %1 column %2").arg(i).arg(j)));
+        }
+    }
+
+
+    QCompleter completer(&model);
+    completer.setCompletionColumn(1);
+
+    QLineEdit edit;
+    edit.setCompleter(&completer);
+    edit.show();
+    edit.setFocus();
+
+    QTest::qWait(100);
+
+    QTest::keyClick(&edit, 'r');
+    QTest::keyClick(edit.completer()->popup(), Qt::Key_Down);
+    QTest::keyClick(edit.completer()->popup(), Qt::Key_Down);
+    QTest::keyClick(edit.completer()->popup(), Qt::Key_Enter);
+
+    QCOMPARE(edit.text(), QString("row 1 column 1"));
+
+    edit.clear();
+
+    QTest::keyClick(&edit, 'r');
+    QTest::keyClick(edit.completer()->popup(), Qt::Key_Up);
+    QTest::keyClick(edit.completer()->popup(), Qt::Key_Up);
+    QTest::keyClick(edit.completer()->popup(), Qt::Key_Enter);
+
+    QCOMPARE(edit.text(), QString("row 3 column 1"));
+}
+
 QTEST_MAIN(tst_QCompleter)
 #include "tst_qcompleter.moc"