summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-09-25 11:35:34 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-09-25 11:35:34 (GMT)
commit02f161410dce9e2bac89f11d293f811bb224257c (patch)
tree00e668623a831d07e326840327400c7a52bbe14f /src/gui/util
parent6d240dd985bc9af5756ff6f494112d677cb8148f (diff)
downloadQt-02f161410dce9e2bac89f11d293f811bb224257c.zip
Qt-02f161410dce9e2bac89f11d293f811bb224257c.tar.gz
Qt-02f161410dce9e2bac89f11d293f811bb224257c.tar.bz2
Made QDir::tempPath and QDesktopServices::TempLocation consistent in S60
Reviewed-by: TrustMe Autotest: Fixes qdesktopservices::storageLocation test
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qdesktopservices_s60.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index b78e51b..fd06cf3 100644
--- a/src/gui/util/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -70,7 +70,6 @@ QT_BEGIN_NAMESPACE
_LIT(KCacheSubDir, "Cache\\");
_LIT(KSysBin, "\\Sys\\Bin\\");
-_LIT(KTempDir, "\\System\\Temp\\");
_LIT(KBrowserPrefix, "4 " );
_LIT(KFontsDir, "z:\\resource\\Fonts\\");
const TUid KUidBrowser = { 0x10008D39 };
@@ -381,9 +380,7 @@ QString QDesktopServices::storageLocation(StandardLocation type)
#endif
break;
case TempLocation:
- path.Append(writableExeDrive().Name());
- path.Append(KTempDir);
- //return QDir::tempPath(); break;
+ return QDir::tempPath();
break;
case HomeLocation:
path.Append(writableDataRoot());