QFactoryLoader: load extraSearchPath first

Since `QT_QPA_PLATFORM_PLUGIN_PATH` or `-platformpluginpath` specifies the path to platform plugins, `extraSearchPath` should be loaded first. Pick-to: 6.8 Change-Id: I2e62fbf2021250ca864c669a7bbd7d56acd67d1e Reviewed-by: Thiago Macieira <[email protected]> (cherry picked from commit 4575809) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
qt · Dec 23, 2024 · b610831 · b610831
1 parent 7b5dbe1
commit b610831
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
@@ -398,18 +398,18 @@ void QFactoryLoader::update()
 #ifdef QT_SHARED
     Q_D(QFactoryLoader);
 
+    if (!d->extraSearchPath.isEmpty())
+        d->updateSinglePath(d->extraSearchPath);
+
     const QStringList paths = QCoreApplication::libraryPaths();
     for (const QString &pluginDir : paths) {
 #ifdef Q_OS_ANDROID
         QString path = pluginDir;
 #else
         QString path = pluginDir + d->suffix;
 #endif
-
         d->updateSinglePath(path);
     }
-    if (!d->extraSearchPath.isEmpty())
-        d->updateSinglePath(d->extraSearchPath);
 #else
     Q_D(QFactoryLoader);
     qCDebug(lcFactoryLoader) << "ignoring" << d->iid