diff options
| author | mread <qt-info@nokia.com> | 2009-08-05 09:32:17 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-05 09:32:17 (GMT) |
| commit | 638edc80e3b224a6830dda0a2bd3097cb82dcb96 (patch) | |
| tree | bdbb6a19e69f1388abcd032c1795ac87b13ceec1 /src/corelib/plugin/qpluginloader.cpp | |
| parent | 867bcdcce78acca9fde2ffc57e6a304cd2e25517 (diff) | |
| parent | acd877fbff4a0c785143fcc891eae73f5b986ff9 (diff) | |
| download | Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.zip Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.tar.gz Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/plugin/qpluginloader.cpp')
| -rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 5364190..d7692b0 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -311,7 +311,7 @@ void QPluginLoader::setFileName(const QString &fileName) QFileInfoList driveList(QDir::drives()); foreach(const QFileInfo& drive, driveList) { QString testFilePath(drive.absolutePath() + stubPath); - testFilePath = QDir::cleanPath(testFilePath); + testFilePath = QDir::cleanPath(testFilePath); if (QFile::exists(testFilePath)) { fn = testFilePath; break; @@ -319,7 +319,7 @@ void QPluginLoader::setFileName(const QString &fileName) } } } - + #else QString fn = QFileInfo(fileName).canonicalFilePath(); #endif |