diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-20 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-20 23:00:13 (GMT) |
| commit | fff5d2c672b06e40903f9b9e067829d59f1397e0 (patch) | |
| tree | 1f6af551d7770ab645679134b4fa84605457f969 /src/corelib/kernel | |
| parent | 0b41e3f1215d59b381af5073ddc6c912b5aa36e7 (diff) | |
| parent | 2df43004a5c093879371574cfe9ea3f68fefa69c (diff) | |
| download | Qt-fff5d2c672b06e40903f9b9e067829d59f1397e0.zip Qt-fff5d2c672b06e40903f9b9e067829d59f1397e0.tar.gz Qt-fff5d2c672b06e40903f9b9e067829d59f1397e0.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcore_symbian_p.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp index 57ae2af..4f953a7 100644 --- a/src/corelib/kernel/qcore_symbian_p.cpp +++ b/src/corelib/kernel/qcore_symbian_p.cpp @@ -121,18 +121,17 @@ public: TInt err = iFs.CreatePrivatePath(sysdrive); if (err != KErrNone && err != KErrAlreadyExists) qWarning("Failed to create private path on system drive."); - //BC with 4.7: set working directory to same drive as application TFileName pfn = RProcess().FileName(); TInt drive; if (pfn.Length() > 0 && iFs.CharToDrive(pfn[0], drive) == KErrNone) { - // for system drive or rom based apps, leave the path on system drive + //BC with 4.7: create private path on application drive (except rom or system drive which is done above) if (drive != sysdrive && drive != EDriveZ) { err = iFs.CreatePrivatePath(drive); - if (err == KErrNone || err == KErrAlreadyExists) - iFs.SetSessionToPrivate(drive); - else + if (err != KErrNone && err != KErrAlreadyExists) qWarning("Failed to create private path on application drive."); } + //BC with 4.7: set working directory to same drive as application + iFs.SetSessionToPrivate(drive); } } |