summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin/qmachparser.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2021-09-14 14:19:15 -0700
committerThiago Macieira <thiago.macieira@intel.com>2021-10-04 14:01:43 -0700
commit279176aa5d6dc10641a54a06e9cf4d6a4041da16 (patch)
treede01febe20d733008048e2bfce8abb65d8eb5fa7 /src/corelib/plugin/qmachparser.cpp
parent461084b6c483c0dc90415d4f16868e194fcd6f0a (diff)
QPlugin: simplify handling of exact results from Q{Elf,Mach}Parser
Those two scanners always return exact results, if the metadata is present, so we don't need to re-scan (haven't needed since Qt 5.0). Especially since we scan from the end, we were spending cycles doing unnecessary work. Change-Id: I42eb903a916645db9900fffd16a4ccfdc7342278 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/plugin/qmachparser.cpp')
-rw-r--r--src/corelib/plugin/qmachparser.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/plugin/qmachparser.cpp b/src/corelib/plugin/qmachparser.cpp
index ef989f2ac09..88462b97b20 100644
--- a/src/corelib/plugin/qmachparser.cpp
+++ b/src/corelib/plugin/qmachparser.cpp
@@ -204,8 +204,7 @@ QLibraryScanResult QMachOParser::parse(const char *m_s, ulong fdlen, QString *e
}
// No .qtmetadata section was found
- if (errorString)
- *errorString = QLibrary::tr("'%1' is not a Qt plugin").arg(library);
+ *errorString = QLibrary::tr("'%1' is not a Qt plugin").arg(*errorString);
return {};
}