You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.3 KiB
33 lines
1.3 KiB
From 2e02b383e03c30f53ff613e431e8fe1d063d5502 Mon Sep 17 00:00:00 2001 |
|
From: Olivier Goffart <ogoffart@woboq.com> |
|
Date: Fri, 8 Nov 2019 11:30:40 +0100 |
|
Subject: [PATCH] Do not load plugin from the $PWD |
|
|
|
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> |
|
--- |
|
src/corelib/plugin/qpluginloader.cpp | 1 - |
|
1 file changed, 1 deletion(-) |
|
|
|
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp |
|
index aab00cc7eb..15b8654391 100644 |
|
--- a/src/corelib/plugin/qpluginloader.cpp |
|
+++ b/src/corelib/plugin/qpluginloader.cpp |
|
@@ -304,7 +304,6 @@ static QString locatePlugin(const QString& fileName) |
|
paths.append(fileName.left(slash)); // don't include the '/' |
|
} else { |
|
paths = QCoreApplication::libraryPaths(); |
|
- paths.prepend(QStringLiteral(".")); // search in current dir first |
|
} |
|
|
|
for (const QString &path : qAsConst(paths)) { |
|
-- |
|
2.24.1 |
|
|
|
|