diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-08-28 12:05:33 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-30 07:37:13 (GMT) |
| commit | 919f939757e37527780cf53566d43dd13f86c225 (patch) | |
| tree | 601c158a21c01ff9cda3698ac2496e6e526e42d8 /src/corelib/io | |
| parent | 8ec8439755e33aee40db14f8a2b5073e420294e7 (diff) | |
| download | Qt-919f939757e37527780cf53566d43dd13f86c225.zip Qt-919f939757e37527780cf53566d43dd13f86c225.tar.gz Qt-919f939757e37527780cf53566d43dd13f86c225.tar.bz2 | |
Blackberry: Fix QFileSystemEngine::tempPath()
Apparently it depends on the user and/or firmware version on whether
TMPDIR or TEMP is set, so try both.
Additionally, fall back to /tmp if neither is set, as that seems to be
present on all devices.
This is a backport of a135d87a0f8ec24445e13fb54f4316e4ca7473be from
Qt5.
Change-Id: I1637f4ab74c8c8bd350b4efb451c2143c0642796
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index f2a7004..9476a74 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -627,9 +627,12 @@ QString QFileSystemEngine::tempPath() return QLatin1String(QT_UNIX_TEMP_PATH_OVERRIDE); #elif defined(Q_OS_BLACKBERRY) QString temp = QFile::decodeName(qgetenv("TEMP")); + if (temp.isEmpty()) + temp = QFile::decodeName(qgetenv("TMPDIR")); + if (temp.isEmpty()) { - qWarning("TEMP environment variable not set. Cannot determine temporary directory"); - return QString(); + qWarning("Neither the TEMP nor the TMPDIR environment variable is set, falling back to /tmp."); + temp = QLatin1String("/tmp/"); } return QDir::cleanPath(temp); #else |