diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-19 12:34:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-19 12:34:21 (GMT) |
| commit | 85e321843a5729d19709273d625f1528156400a2 (patch) | |
| tree | bcb285dfa02b399daddd43a761fa6d214782b3ea /src | |
| parent | af39f48589873339a83d8e11aebe7fc1a6a3d8e8 (diff) | |
| parent | 66669ef4e0abf48fcf8282fc4f746f3f45f0cca0 (diff) | |
| download | Qt-85e321843a5729d19709273d625f1528156400a2.zip Qt-85e321843a5729d19709273d625f1528156400a2.tar.gz Qt-85e321843a5729d19709273d625f1528156400a2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Allow hard-coding the Unix temp path
Use file names in header include guards instead of namespace names
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index 40fb0c0..6acd811 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -612,10 +612,14 @@ QString QFileSystemEngine::rootPath() QString QFileSystemEngine::tempPath() { +#ifdef QT_UNIX_TEMP_PATH_OVERRIDE + return QLatin1String(QT_UNIX_TEMP_PATH_OVERRIDE); +#else QString temp = QFile::decodeName(qgetenv("TMPDIR")); if (temp.isEmpty()) temp = QLatin1String("/tmp/"); return QDir::cleanPath(temp); +#endif } bool QFileSystemEngine::setCurrentPath(const QFileSystemEntry &path) |