diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-21 14:03:39 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-22 11:18:12 (GMT) |
| commit | a4535ccd01364c938198db325d36372a4844c4ab (patch) | |
| tree | b24e24d95c20977781a31df66cd2f275f081778c | |
| parent | 761b2237fb19aab1ba7827790187df0314969d95 (diff) | |
| download | Qt-a4535ccd01364c938198db325d36372a4844c4ab.zip Qt-a4535ccd01364c938198db325d36372a4844c4ab.tar.gz Qt-a4535ccd01364c938198db325d36372a4844c4ab.tar.bz2 | |
QCoreApplicationPrivate::appendApplicationPathToLibraryPaths WinCE fix
On Windows CE the plugin path is likely to be the same as the
application directory. That's why we must not compare app_location
with the plugins path.
The check app_libpaths->contains(app_location) should be enough.
Autotest: tst_QApplication::libraryPaths
Reviewed-by: thartman
(cherry picked from commit c8816c6da9d265e5ccbf0385280556f9b4c521f6)
| -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 b0add8c..06a8c4a 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 } |