Skip to content

Commit 7bc81ef

Browse files
committed
Relative Path for QML files
Calculate the relative path to the imported QML file without resolving symlinks. The path should be resolved lexically.
1 parent 4b43bc5 commit 7bc81ef

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/qml.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ void deployQml(appdir::AppDir &appDir, const boost::filesystem::path &installQml
173173
const auto &entry = *i;
174174

175175
if (!bf::is_directory(entry)) {
176-
auto relativeFilePath = qmlImport.relativePath / bf::relative(entry.path(), qmlImport.path);
176+
// lexically relative doesn't resolve symlinks, so the paths stay correct
177+
auto relativeFilePath = qmlImport.relativePath / entry.path().lexically_relative(qmlImport.path);
177178
try {
178179
elf::ElfFile file(entry.path());
179180
appDir.deployLibrary(entry.path(), targetQmlModulesPath / relativeFilePath);

0 commit comments

Comments
 (0)