Skip to content

fix: prevent duplicate QML import paths #1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Sep 4, 2025
Merged

fix: prevent duplicate QML import paths #1239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions frame/qmlengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ class DQmlEnginePrivate : public DObjectPrivate
QObject::connect(s_engine, &QQmlEngine::quit, qApp, &QCoreApplication::quit);
auto paths = s_engine->importPathList();
// high priority for builtin plugin.
paths.prepend(DDE_SHELL_QML_INSTALL_DIR);
if (!paths.contains(DDE_SHELL_QML_INSTALL_DIR))
paths.prepend(DDE_SHELL_QML_INSTALL_DIR);
const QString rootDir = QCoreApplication::applicationDirPath();
QDir pluginDir(rootDir);
if (pluginDir.cd("../plugins")) {
paths.prepend(pluginDir.absolutePath());
if (!paths.contains(pluginDir.absolutePath()))
paths.prepend(pluginDir.absolutePath());
}
Comment on lines 45 to 49
Copy link

@sourcery-ai sourcery-ai bot Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (bug_risk): Absolute path comparison may not account for symbolic links or path normalization.

Consider using canonicalPath() or normalizing paths before comparison to prevent duplicate entries due to symbolic links or differing path formats.

Suggested change
QDir pluginDir(rootDir);
if (pluginDir.cd("../plugins")) {
paths.prepend(pluginDir.absolutePath());
if (!paths.contains(pluginDir.absolutePath()))
paths.prepend(pluginDir.absolutePath());
}
QDir pluginDir(rootDir);
if (pluginDir.cd("../plugins")) {
QString pluginCanonicalPath = pluginDir.canonicalPath();
QStringList canonicalPaths;
for (const QString &path : paths) {
QDir dir(path);
canonicalPaths << dir.canonicalPath();
}
if (!canonicalPaths.contains(pluginCanonicalPath))
paths.prepend(pluginCanonicalPath);
}

s_engine->setImportPathList(paths);
qCDebug(dsLog()) << "Engine importPaths" << s_engine->importPathList();
Expand Down