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

Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index fdc5bdd915..09129f0676 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -165,6 +165,7 @@ private slots:
     void setCustomModelAndView();
     void updateDelegateOnEditableChange();
     void respectChangedOwnershipOfItemView();
+    void task_QTBUG_39088_inputMethodHints();
 };
 
 class MyAbstractItemDelegate : public QAbstractItemDelegate
@@ -3170,6 +3171,14 @@ void tst_QComboBox::updateDelegateOnEditableChange()
     }
 }
 
+void tst_QComboBox::task_QTBUG_39088_inputMethodHints()
+{
+    QComboBox box;
+    box.setEditable(true);
+    box.setInputMethodHints(Qt::ImhNoPredictiveText);
+    QCOMPARE(box.lineEdit()->inputMethodHints(), Qt::ImhNoPredictiveText);
+}
+
 void tst_QComboBox::respectChangedOwnershipOfItemView()
 {
     QComboBox box1;