3 files changed, 53 insertions, 0 deletions
diff --git a/src/corelib/io/qtemporarydir.cpp b/src/corelib/io/qtemporarydir.cpp
index 6e50a8513e..d116d00bb9 100644
--- a/src/corelib/io/qtemporarydir.cpp
+++ b/src/corelib/io/qtemporarydir.cpp
@@ -305,6 +305,33 @@ QString QTemporaryDir::path() const
 }
 
 /*!
+    \since 5.8
+
+    Returns the path name of a file in the temporary directory.
+    Does \e not check if the file actually exists in the directory.
+    Redundant multiple separators or "." and ".." directories in
+    \a fileName are not removed (see QDir::cleanPath()). Absolute
+    paths are not allowed.
+*/
+QString QTemporaryDir::filePath(const QString &fileName) const
+{
+    if (QDir::isAbsolutePath(fileName)) {
+        qWarning("QTemporaryDir::filePath: Absolute paths are not allowed: %s", qUtf8Printable(fileName));
+        return QString();
+    }
+
+    if (!d_ptr->success)
+        return QString();
+
+    QString ret = d_ptr->pathOrError;
+    if (!fileName.isEmpty()) {
+        ret += QLatin1Char('/');
+        ret += fileName;
+    }
+    return ret;
+}
+
+/*!
    Returns \c true if the QTemporaryDir is in auto remove
    mode. Auto-remove mode will automatically delete the directory from
    disk upon destruction. This makes it very easy to create your
diff --git a/src/corelib/io/qtemporarydir.h b/src/corelib/io/qtemporarydir.h
index 2e70d34ae4..3f6b70a2eb 100644
--- a/src/corelib/io/qtemporarydir.h
+++ b/src/corelib/io/qtemporarydir.h
@@ -65,6 +65,7 @@ public:
     bool remove();
 
     QString path() const;
+    QString filePath(const QString &fileName) const;
 
 private:
     QScopedPointer<QTemporaryDirPrivate> d_ptr;
diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
index 487c13be94..758bbead84 100644
--- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
+++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
@@ -57,6 +57,8 @@ private slots:
     void fileTemplate_data();
     void getSetCheck();
     void fileName();
+    void filePath_data();
+    void filePath();
     void autoRemove();
     void nonWritableCurrentDir();
     void openOnRootDrives();
@@ -204,6 +206,29 @@ void tst_QTemporaryDir::fileName()
     QCOMPARE(absoluteFilePath, absoluteTempPath);
 }
 
+void tst_QTemporaryDir::filePath_data()
+{
+    QTest::addColumn<QString>("templatePath");
+    QTest::addColumn<QString>("fileName");
+
+    QTest::newRow("0") << QString() << "/tmpfile";
+    QTest::newRow("1") << QString() << "tmpfile";
+    QTest::newRow("2") << "XXXXX" << "tmpfile";
+    QTest::newRow("3") << "YYYYY" << "subdir/file";
+}
+
+void tst_QTemporaryDir::filePath()
+{
+    QFETCH(QString, templatePath);
+    QFETCH(QString, fileName);
+
+    QTemporaryDir dir(templatePath);
+    const QString filePath = dir.filePath(fileName);
+    const QString expectedFilePath = QDir::isAbsolutePath(fileName) ?
+                                     QString() : dir.path() + QLatin1Char('/') + fileName;
+    QCOMPARE(filePath, expectedFilePath);
+}
+
 void tst_QTemporaryDir::autoRemove()
 {
     // Test auto remove