1 files changed, 44 insertions, 8 deletions

diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h
index 7f365f0e8a..46a0d7aba3 100644
--- a/src/corelib/io/qtemporaryfile_p.h
+++ b/src/corelib/io/qtemporaryfile_p.h
@@ -53,25 +53,48 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_TEMPORARYFILE
-
 #include "private/qfsfileengine_p.h"
 #include "private/qfilesystemengine_p.h"
 #include "private/qfile_p.h"
+#include "qtemporaryfile.h"
+
+#ifdef Q_OS_LINUX
+#  include <fcntl.h>
+#  ifdef O_TMPFILE
+// some early libc support had the wrong values for O_TMPFILE
+// (see https://bugzilla.gnome.org/show_bug.cgi?id=769453#c18)
+#    if (O_TMPFILE & O_DIRECTORY) == O_DIRECTORY
+#      define LINUX_UNNAMED_TMPFILE
+#    endif
+#  endif
+#endif
 
 QT_BEGIN_NAMESPACE
 
+struct QTemporaryFileName
+{
+    QFileSystemEntry::NativePath path;
+    qssize_t pos;
+    qssize_t length;
+
+    QTemporaryFileName(const QString &templateName);
+    QFileSystemEntry::NativePath generateNext();
+};
+
+#ifndef QT_NO_TEMPORARYFILE
+
 class QTemporaryFilePrivate : public QFilePrivate
 {
     Q_DECLARE_PUBLIC(QTemporaryFile)
 
-protected:
+public:
     QTemporaryFilePrivate();
     explicit QTemporaryFilePrivate(const QString &templateNameIn);
     ~QTemporaryFilePrivate();
 
     QAbstractFileEngine *engine() const override;
     void resetFileEngine() const;
+    void materializeUnnamedFile();
 
     bool autoRemove = true;
     QString templateName = defaultTemplateName();
@@ -85,37 +108,50 @@ class QTemporaryFileEngine : public QFSFileEngine
 {
     Q_DECLARE_PRIVATE(QFSFileEngine)
 public:
+    QTemporaryFileEngine(const QString *templateName)
+        : templateName(*templateName)
+    {}
+
     void initialize(const QString &file, quint32 mode, bool nameIsTemplate = true)
     {
         Q_D(QFSFileEngine);
         Q_ASSERT(!isReallyOpen());
         fileMode = mode;
         filePathIsTemplate = filePathWasTemplate = nameIsTemplate;
-        d->fileEntry = QFileSystemEntry(file);
 
-        if (!filePathIsTemplate)
+        if (filePathIsTemplate) {
+            d->fileEntry.clear();
+        } else {
+            d->fileEntry = QFileSystemEntry(file);
             QFSFileEngine::setFileName(file);
+        }
     }
     ~QTemporaryFileEngine();
 
     bool isReallyOpen() const;
     void setFileName(const QString &file) override;
-    void setFileTemplate(const QString &fileTemplate);
 
     bool open(QIODevice::OpenMode flags) override;
     bool remove() override;
     bool rename(const QString &newName) override;
     bool renameOverwrite(const QString &newName) override;
     bool close() override;
+    QString fileName(FileName file) const override;
 
+    enum MaterializationMode { Overwrite, DontOverwrite, NameIsTemplate };
+    bool materializeUnnamedFile(const QString &newName, MaterializationMode mode);
+    bool isUnnamedFile() const;
+
+    const QString &templateName;
     quint32 fileMode;
     bool filePathIsTemplate;
     bool filePathWasTemplate;
+    bool unnamedFile = false;
 };
 
-QT_END_NAMESPACE
-
 #endif // QT_NO_TEMPORARYFILE
 
+QT_END_NAMESPACE
+
 #endif /* QTEMPORARYFILE_P_H */