|
@@ -0,0 +1,32 @@
|
|
|
+From bf131e8d2181b3404f5293546ed390999f760404 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>
|
|
|
+
|
|
|
+Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404
|
|
|
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
|
+---
|
|
|
+ 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 cadff4f32b..c2443dbdda 100644
|
|
|
+--- a/src/corelib/plugin/qpluginloader.cpp
|
|
|
++++ b/src/corelib/plugin/qpluginloader.cpp
|
|
|
+@@ -305,7 +305,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.25.0
|
|
|
+
|