Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

3 files changed, 14 insertions, 12 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
index acb9155ca8..4f15f96cba 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
@@ -287,17 +287,15 @@ void tst_QGraphicsLayoutItem::setMaximumSize()
 void tst_QGraphicsLayoutItem::setMinimumSize_data()
 {
     QTest::addColumn<QSizeF>("size");
-    QTest::addColumn<QSizeF>("outputSize");
-    QTest::newRow("-1") << QSizeF(-1, -1) << QSizeF(0, 0);
-    QTest::newRow("0") << QSizeF(0, 0) << QSizeF(0, 0);
-    QTest::newRow("10") << QSizeF(10, 10) << QSizeF(10, 10);
+    QTest::newRow("-1") << QSizeF(-1, -1);
+    QTest::newRow("0") << QSizeF(0, 0);
+    QTest::newRow("10") << QSizeF(10, 10);
 }
 
 // void setMinimumSize(QSizeF const& size) public
 void tst_QGraphicsLayoutItem::setMinimumSize()
 {
     QFETCH(QSizeF, size);
-    QFETCH(QSizeF, outputSize);
     SubQGraphicsLayoutItem layoutItem;
     QSizeF oldSize = layoutItem.minimumSize();
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index d7b1ef9199..df529c6095 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -3766,6 +3766,7 @@ void tst_QGraphicsScene::inputMethod()
     QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
 
     inputContext.m_resetCallCount = 0;
+    inputContext.m_commitCallCount = 0;
     scene.addItem(item);
     QInputMethodEvent event;
 
@@ -3784,7 +3785,7 @@ void tst_QGraphicsScene::inputMethod()
     scene.setFocusItem(0);
     // 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.m_resetCallCount, callFocusItem ? 2 : 0);
+    QCOMPARE(inputContext.m_resetCallCount + inputContext.m_commitCallCount, callFocusItem ? 2 : 0);
     QCOMPARE(item->queryCalls, callFocusItem ? 1 : 0); // verify that value is unaffected
 
     item->eventCalls = 0;
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index ee7ec7ba57..1838977749 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -3712,7 +3712,7 @@ void tst_QGraphicsView::render()
     view.show();
     QTest::qWaitForWindowShown(&view);
     QApplication::processEvents();
-    QTRY_VERIFY(view.painted > 0);
+    QTRY_VERIFY(view.painted);
 
     RenderTester *r1 = new RenderTester(QRectF(0, 0, 50, 50));
     RenderTester *r2 = new RenderTester(QRectF(50, 50, 50, 50));
@@ -4187,21 +4187,22 @@ void tst_QGraphicsView::inputContextReset()
     item1->setFlags(QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemAcceptsInputMethod);
 
     inputContext.m_resetCallCount = 0;
+    inputContext.m_commitCallCount = 0;
     scene.addItem(item1);
     QCOMPARE(inputContext.m_resetCallCount, 0);
+    QCOMPARE(inputContext.m_commitCallCount, 0);
 
-    inputContext.m_resetCallCount = 0;
     scene.setFocusItem(item1);
     QCOMPARE(scene.focusItem(), (QGraphicsItem *)item1);
     QVERIFY(view.testAttribute(Qt::WA_InputMethodEnabled));
     QCOMPARE(inputContext.m_resetCallCount, 0);
+    QCOMPARE(inputContext.m_commitCallCount, 0);
 
-    inputContext.m_resetCallCount = 0;
     scene.setFocusItem(0);
     // 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.
     //    QEXPECT_FAIL("", "QTBUG-22454", Abort);
-    QCOMPARE(inputContext.m_resetCallCount, 2);
+    QCOMPARE(inputContext.m_resetCallCount + inputContext.m_commitCallCount, 2);
 
     // introduce another item that is focusable but does not accept input methods
     QGraphicsItem *item2 = new QGraphicsRectItem;
@@ -4209,17 +4210,19 @@ void tst_QGraphicsView::inputContextReset()
     scene.addItem(item2);
 
     inputContext.m_resetCallCount = 0;
+    inputContext.m_commitCallCount = 0;
     scene.setFocusItem(item2);
     QCOMPARE(inputContext.m_resetCallCount, 0);
+    QCOMPARE(inputContext.m_commitCallCount, 0);
 
-    inputContext.m_resetCallCount = 0;
     scene.setFocusItem(item1);
     QCOMPARE(inputContext.m_resetCallCount, 0);
+    QCOMPARE(inputContext.m_commitCallCount, 0);
 
     // test changing between between items that accept input methods.
     item2->setFlags(QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemAcceptsInputMethod);
     scene.setFocusItem(item2);
-    QCOMPARE(inputContext.m_resetCallCount, 1);
+    QCOMPARE(inputContext.m_resetCallCount + inputContext.m_commitCallCount, 1);
 }
 
 void tst_QGraphicsView::indirectPainting()