Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	doc/src/development/qmake-manual.qdoc
	mkspecs/symbian-gcce/qmake.conf
	qmake/project.cpp
	src/corelib/global/qnamespace.qdoc
	src/declarative/graphicsitems/qdeclarativetext.cpp
	src/gui/text/qtextdocumentlayout.cpp
	src/gui/text/qtextdocumentlayout_p.h
	tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
	tests/auto/networkselftest/networkselftest.pro
	tests/auto/qscriptengine/tst_qscriptengine.cpp
	tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
	tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt-html-templates.qdocconf
	tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
	tools/qdoc3/test/qt.qdocconf
	tools/qdoc3/test/qt_ja_JP.qdocconf
	tools/qdoc3/test/qt_zh_CN.qdocconf

1 files changed, 10 insertions, 2 deletions

diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index f8fc5d0..ca6b4d2 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -4146,11 +4146,14 @@ void tst_QGraphicsView::inputContextReset()
 
     inputContext.resets = 0;
     scene.setFocusItem(0);
-    QCOMPARE(inputContext.resets, 1);
+    // the input context is reset twice, once because an item has lost focus and again because
+    // the Qt::WA_InputMethodEnabled flag is cleared because no item has focus.
+    QCOMPARE(inputContext.resets, 2);
 
     // introduce another item that is focusable but does not accept input methods
     QGraphicsItem *item2 = new QGraphicsRectItem;
-    item1->setFlags(QGraphicsItem::ItemIsFocusable);
+    item2->setFlags(QGraphicsItem::ItemIsFocusable);
+    scene.addItem(item2);
 
     inputContext.resets = 0;
     scene.setFocusItem(item2);
@@ -4159,6 +4162,11 @@ void tst_QGraphicsView::inputContextReset()
     inputContext.resets = 0;
     scene.setFocusItem(item1);
     QCOMPARE(inputContext.resets, 0);
+
+    // test changing between between items that accept input methods.
+    item2->setFlags(QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemAcceptsInputMethod);
+    scene.setFocusItem(item2);
+    QCOMPARE(inputContext.resets, 1);
 }
 
 void tst_QGraphicsView::indirectPainting()