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

Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index c919d4ca79..db42ed3119 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -229,6 +229,7 @@ private slots:
 
     void isModified();
     void edited();
+    void fixupDoesNotModify_QTBUG_49295();
 
     void insert();
     void setSelection_data();
@@ -2845,6 +2846,29 @@ void tst_QLineEdit::edited()
     QVERIFY(testWidget->isModified());
 }
 
+void tst_QLineEdit::fixupDoesNotModify_QTBUG_49295()
+{
+    QLineEdit *testWidget = ensureTestWidget();
+
+    ValidatorWithFixup val;
+    testWidget->setValidator(&val);
+    testWidget->setText("foo");
+    QVERIFY(!testWidget->isModified());
+    QVERIFY(!testWidget->hasAcceptableInput());
+
+    QTest::keyClicks(testWidget, QStringLiteral("bar"));
+    QVERIFY(testWidget->isModified());
+    QVERIFY(!testWidget->hasAcceptableInput());
+
+    // trigger a fixup, which should not reset the modified flag
+    QFocusEvent lostFocus(QEvent::FocusOut);
+    qApp->sendEvent(testWidget, &lostFocus);
+
+    QVERIFY(testWidget->hasAcceptableInput());
+    QEXPECT_FAIL("", "QTBUG-49295: a fixup of a line edit should keep it modified", Continue);
+    QVERIFY(testWidget->isModified());
+}
+
 void tst_QLineEdit::insert()
 {
     QLineEdit *testWidget = ensureTestWidget();