diff options
| author |   Olivier Goffart <ogoffart@woboq.com> | 2019-11-08 11:30:40 +0100 |
|---|---|---|
| committer |   Thiago Macieira <thiago.macieira@intel.com> | 2020-01-28 17:53:38 +0000 |
| commit | 5c4234ed958130d655df8197129806f687d4df0d (patch) | |
| tree | 3c4b38969d7d499fde430bf379b54221106bde22 | |
| parent | Add missing emission of activated(QString) (diff) | |
| download | qtbase-5.5.tar.xz qtbase-5.5.zip | |
Do not load plugin from the $PWD5.5
I see no reason why this would make sense to look for plugins in the current
directory. And when there are plugins there, it may actually be wrong
Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit bf131e8d2181b3404f5293546ed390999f760404)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 52b739776daecf80a8276b49c9e4337e018d8e8b)
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
(cherry-picked from commit 2e02b383e03c30f53ff613e431e8fe1d063d5502)
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 988dad1d94..27d2079f58 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -286,7 +286,6 @@ static QString locatePlugin(const QString& fileName) const bool debug = qt_debug_component(); QStringList paths = QCoreApplication::libraryPaths(); - paths.prepend(QStringLiteral("./")); // search in current dir first foreach (const QString &path, paths) { foreach (const QString &prefix, prefixes) { foreach (const QString &suffix, suffixes) { |