diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-05-29 05:23:17 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-05-29 05:23:17 (GMT) |
commit | 8acc20e525d589e0c4450fbd60141e8b9c3f40e9 (patch) | |
tree | a81147726f300618056a685aa5bf8a1f152cf670 /src/corelib/io | |
parent | 9088aeae9daf02546769377853824397458ba822 (diff) | |
download | Qt-8acc20e525d589e0c4450fbd60141e8b9c3f40e9.zip Qt-8acc20e525d589e0c4450fbd60141e8b9c3f40e9.tar.gz Qt-8acc20e525d589e0c4450fbd60141e8b9c3f40e9.tar.bz2 |
Fixed compile with MinGW.
MinGW 3.4.5 can't figure out the automatic QLatin1Char -> QString
conversion in this code.
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 790f1eb..9da9e66 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1770,10 +1770,10 @@ QString QFSFileEngine::fileName(FileName file) const if(slash == -1) { if(d->filePath.length() >= 2 && d->filePath.at(1) == QLatin1Char(':')) return d->filePath.left(2); - return QLatin1Char('.'); + return QString(QLatin1Char('.')); } else { if(!slash) - return QLatin1Char('/'); + return QString(QLatin1Char('/')); if(slash == 2 && d->filePath.length() >= 2 && d->filePath.at(1) == QLatin1Char(':')) slash++; return d->filePath.left(slash); @@ -1831,7 +1831,7 @@ QString QFSFileEngine::fileName(FileName file) const if (slash == -1) ret = QDir::currentPath(); else if (slash == 0) - ret = QLatin1Char('/'); + ret = QString(QLatin1Char('/')); ret = ret.left(slash); } return ret; |