diff options
author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2010-02-15 17:00:18 (GMT) |
---|---|---|
committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2010-02-15 17:21:28 (GMT) |
commit | 4f2c8da75770716ca797d488f5e82e909b2d4e2c (patch) | |
tree | e22e093bf1117c3f8890aef267e1869be2ada43b /src/gui/util | |
parent | 8ac9280bad33e7f70bfb4381e20c6aae785ce744 (diff) | |
download | Qt-4f2c8da75770716ca797d488f5e82e909b2d4e2c.zip Qt-4f2c8da75770716ca797d488f5e82e909b2d4e2c.tar.gz Qt-4f2c8da75770716ca797d488f5e82e909b2d4e2c.tar.bz2 |
Fixing QDesktopServices so that file server session can be accessed
from secondary thread.
It is well known fact that CEikonEnv::Static() will return NULL from
secondary thread. This means that accessing QDesktopServices from
secondary thread will cause crash.
Example for this is qmlviewer, where there is separate thread that
handles .qml files.
Reviewed-by: TrustMe
Diffstat (limited to 'src/gui/util')
-rw-r--r-- | src/gui/util/qdesktopservices_s60.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp index 319c4b0..0f5792f 100644 --- a/src/gui/util/qdesktopservices_s60.cpp +++ b/src/gui/util/qdesktopservices_s60.cpp @@ -413,11 +413,11 @@ QString QDesktopServices::storageLocation(StandardLocation type) //return QDir::homePath(); break; break; case DataLocation: - CEikonEnv::Static()->FsSession().PrivatePath(path); + qt_s60GetRFs().PrivatePath(path); path.Insert(0, writableExeDrive().Name()); break; case CacheLocation: - CEikonEnv::Static()->FsSession().PrivatePath(path); + qt_s60GetRFs().PrivatePath(path); path.Insert(0, writableExeDrive().Name()); path.Append(KCacheSubDir); break; |