diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-05-20 08:07:16 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-05-20 12:40:32 (GMT) |
commit | 358d5b2fd70010c1b5f65b820dfadf38f51f65b4 (patch) | |
tree | d7f10c0efe276083fc1f31395fa83b808ca0970a /src/corelib/kernel/qcoreapplication.cpp | |
parent | ed0ecda733b5f844b385f57fb00f3801427c30b6 (diff) | |
download | Qt-358d5b2fd70010c1b5f65b820dfadf38f51f65b4.zip Qt-358d5b2fd70010c1b5f65b820dfadf38f51f65b4.tar.gz Qt-358d5b2fd70010c1b5f65b820dfadf38f51f65b4.tar.bz2 |
Remove S60 version plugins
S60 version plugins serve no purpose now that S60 3.x support has
been dropped, so remove them to improve performance.
Task-number: QTBUG-18614
Reviewed-by: Janne Koskinen
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index c0b1748..aba3a28 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -116,8 +116,6 @@ private: }; #ifdef Q_OS_SYMBIAN -typedef TDriveNumber (*SystemDriveFunc)(RFs&); -static SystemDriveFunc PtrGetSystemDrive = 0; static CApaCommandLine* apaCommandLine = 0; static char *apaTail = 0; static QVector<char *> *apaArgv = 0; @@ -1950,10 +1948,7 @@ QString QCoreApplication::applicationDirPath() } if (err != KErrNone || (driveInfo.iDriveAtt & KDriveAttRom) || (driveInfo.iMediaAtt & KMediaAttWriteProtected)) { - if(!PtrGetSystemDrive) - PtrGetSystemDrive = reinterpret_cast<SystemDriveFunc>(qt_resolveS60PluginFunc(S60Plugin_GetSystemDrive)); - Q_ASSERT(PtrGetSystemDrive); - drive = PtrGetSystemDrive(fs); + drive = fs.GetSystemDrive(); fs.DriveToChar(drive, driveChar); } |