Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I5d2a4fa33b4aa22da39ac045e6b85ab940b8720b

2 files changed, 37 insertions, 3 deletions

diff --git a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
index 96970421d3..f1327933c4 100644
--- a/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
+++ b/tests/auto/corelib/io/qsavefile/tst_qsavefile.cpp
@@ -72,6 +72,7 @@ public slots:
 
 private slots:
     void transactionalWrite();
+    void retryTransactionalWrite();
     void textStreamManualFlush();
     void textStreamAutoFlush();
     void saveTwice();
@@ -129,6 +130,39 @@ void tst_QSaveFile::transactionalWrite()
     QCOMPARE(QFile::permissions(targetFile), QFile::permissions(otherFile));
 }
 
+// QTBUG-77007: Simulate the case of an application with a loop prompting
+// to retry saving on failure. Create a read-only file first (Unix only)
+void tst_QSaveFile::retryTransactionalWrite()
+{
+#ifndef Q_OS_UNIX
+    QSKIP("This test is Unix only");
+#endif
+    QTemporaryDir dir;
+    QVERIFY2(dir.isValid(), qPrintable(dir.errorString()));
+
+    QString targetFile = dir.path() + QLatin1String("/outfile");
+    const QString readOnlyName = targetFile + QLatin1String(".ro");
+    {
+        QFile readOnlyFile(readOnlyName);
+        QVERIFY2(readOnlyFile.open(QIODevice::WriteOnly), msgCannotOpen(readOnlyFile).constData());
+        readOnlyFile.write("Hello");
+        readOnlyFile.close();
+        auto permissions = readOnlyFile.permissions();
+        permissions &= ~(QFileDevice::WriteOwner | QFileDevice::WriteGroup | QFileDevice::WriteUser);
+        QVERIFY(readOnlyFile.setPermissions(permissions));
+    }
+
+    QSaveFile file(readOnlyName);
+    QVERIFY(!file.open(QIODevice::WriteOnly));
+
+    file.setFileName(targetFile);
+    QVERIFY2(file.open(QIODevice::WriteOnly), msgCannotOpen(file).constData());
+    QVERIFY(file.isOpen());
+    QCOMPARE(file.write("Hello"), Q_INT64_C(5));
+    QCOMPARE(file.error(), QFile::NoError);
+    QVERIFY(file.commit());
+}
+
 void tst_QSaveFile::saveTwice()
 {
     // Check that we can reuse a QSaveFile object
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index d483df1e70..73b1fd1865 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -6141,7 +6141,7 @@ void tst_QWidget::minAndMaxSizeWithX11BypassWindowManagerHint()
 {
     if (m_platform != QStringLiteral("xcb"))
         QSKIP("This test is for X11 only.");
-    // Same size as in QWidget::create_sys().
+    // Same size as in QWidgetPrivate::create.
     const QSize desktopSize = QApplication::desktop()->size();
     const QSize originalSize(desktopSize.width() / 2, desktopSize.height() * 4 / 10);
 
@@ -9416,7 +9416,7 @@ void tst_QWidget::initialPosForDontShowOnScreenWidgets()
         const QPoint expectedPos(0, 0);
         QWidget widget;
         widget.setAttribute(Qt::WA_DontShowOnScreen);
-        widget.winId(); // Make sure create_sys is called.
+        widget.winId(); // Make sure QWidgetPrivate::create is called.
         QCOMPARE(widget.pos(), expectedPos);
         QCOMPARE(widget.geometry().topLeft(), expectedPos);
     }
@@ -9426,7 +9426,7 @@ void tst_QWidget::initialPosForDontShowOnScreenWidgets()
         QWidget widget;
         widget.setAttribute(Qt::WA_DontShowOnScreen);
         widget.move(expectedPos);
-        widget.winId(); // Make sure create_sys is called.
+        widget.winId(); // Make sure QWidgetPrivate::create is called.
         QCOMPARE(widget.pos(), expectedPos);
         QCOMPARE(widget.geometry().topLeft(), expectedPos);
     }