diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-22 08:53:39 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-22 08:53:39 (GMT) |
| commit | def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7 (patch) | |
| tree | 09e3aa8d6e3f72f815b1beaf6d59261b5f45acdd /src/corelib/kernel | |
| parent | e689e41ad1baad65d90866eefe88a96f5e16fa04 (diff) | |
| parent | d14fd301314bcceaf2594a5a18f6d20894c1d353 (diff) | |
| download | Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.zip Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.tar.gz Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.tar.bz2 | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
src/corelib/kernel/qcoreapplication.cpp
tests/auto/windowsmobile/test/tst_windowsmobile.cpp
Diffstat (limited to 'src/corelib/kernel')
| -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 51e8d00..9283730 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -364,7 +364,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)) # endif app_libpaths->append(app_location); #endif |