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

Conflicts:
	configure
	src/corelib/io/qurl.cpp
	src/gui/kernel/qwindow.cpp
	src/tools/moc/generator.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/styles/qstyle.h
	src/widgets/widgets/qtabbar.cpp
	tests/auto/corelib/codecs/utf8/tst_utf8.cpp

Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 06bf929e4b..22e05a8871 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -271,6 +271,7 @@ private slots:
     void taskQTBUG_7395_readOnlyShortcut();
     void QTBUG697_paletteCurrentColorGroup();
     void QTBUG13520_textNotVisible();
+    void QTBUG7174_inputMaskCursorBlink();
 
     void bidiVisualMovement_data();
     void bidiVisualMovement();
@@ -3693,6 +3694,30 @@ void tst_QLineEdit::QTBUG13520_textNotVisible()
 
 }
 
+class UpdateRegionLineEdit : public QLineEdit
+{
+public:
+    QRegion updateRegion;
+protected:
+    void paintEvent(QPaintEvent *event)
+    {
+        updateRegion = event->region();
+    }
+};
+
+void tst_QLineEdit::QTBUG7174_inputMaskCursorBlink()
+{
+    UpdateRegionLineEdit edit;
+    edit.setInputMask(QLatin1String("AAAA"));
+    edit.setFocus();
+    edit.setText(QLatin1String("AAAA"));
+    edit.show();
+    QRect cursorRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
+    QTest::qWaitForWindowShown(&edit);
+    edit.updateRegion = QRegion();
+    QTest::qWait(QApplication::cursorFlashTime());
+    QVERIFY(edit.updateRegion.contains(cursorRect));
+}
 
 void tst_QLineEdit::bidiVisualMovement_data()
 {