diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-04 15:58:39 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-04 15:58:39 +0200 |
| commit | b5695bd5be908970244919bcd7c19cbf7ccca2c4 (patch) | |
| tree | 29f1e2895bef25db5b47e7e2cf01414f6b32ac8d /src/corelib/io/qdir.cpp | |
| parent | 840729a931a7d3fefbc4b4a8e01f8b1bd69a427e (diff) | |
| parent | b7744e0b05255fc468db2af215ba94eca4b7757b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ibd81cd1df4a0650d93fcb556a57be90be2e1f569
Diffstat (limited to 'src/corelib/io/qdir.cpp')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 9efe2fb90e..f8fae711f2 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -692,7 +692,7 @@ QString QDir::filePath(const QString &fileName) const { const QDirPrivate* d = d_ptr.constData(); if (isAbsolutePath(fileName)) - return QString(fileName); + return fileName; QString ret = d->dirEntry.filePath(); if (!fileName.isEmpty()) { |