diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-22 02:53:19 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-22 02:53:19 (GMT) |
| commit | ffbfb1571c617f82137cdf1171120b1a67baca12 (patch) | |
| tree | e315959209a443b59ab65a7992915628839dac0c | |
| parent | 0bf85b26eac76ba46c412f8f291066a8560f9306 (diff) | |
| parent | c8816c6da9d265e5ccbf0385280556f9b4c521f6 (diff) | |
| download | Qt-ffbfb1571c617f82137cdf1171120b1a67baca12.zip Qt-ffbfb1571c617f82137cdf1171120b1a67baca12.tar.gz Qt-ffbfb1571c617f82137cdf1171120b1a67baca12.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index c0c55bb..fabbc69 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -316,7 +316,7 @@ void QCoreApplicationPrivate::appendApplicationPathToLibraryPaths() QString app_location( QCoreApplication::applicationFilePath() ); app_location.truncate(app_location.lastIndexOf(QLatin1Char('/'))); app_location = QDir(app_location).canonicalPath(); - if (app_location != QLibraryInfo::location(QLibraryInfo::PluginsPath) && QFile::exists(app_location) && !app_libpaths->contains(app_location)) + if (QFile::exists(app_location) && !app_libpaths->contains(app_location)) app_libpaths->append(app_location); #endif } |