AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't try to create nested top-level bundle dir symlinks

Browse Source 
the target path may have multiple components, e.g. Headers/private.
obviously, only the first component must be linked in such cases.

Task-number: QTBUG-32895
Change-Id: If632b3b72c170a9fde36e62c165e06ded53deda3
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-09-25 19:15:27 +02:00
parent 6c6b5ff8fb
commit 9cd9dfb0b1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/unix/unixmake2.cpp
View File

@ -811,8 +811,12 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
if (!project->isEmpty(vkey)) { if (!project->isEmpty(vkey)) {
QString version = project->first(vkey) + "/" + QString version = project->first(vkey) + "/" +
project->first("QMAKE_FRAMEWORK_VERSION") + "/"; project->first("QMAKE_FRAMEWORK_VERSION") + "/";
symlinks[Option::fixPathToLocalOS(path + project->first(pkey))] = ProString name = project->first(pkey);
project->first(vkey) + "/Current/" + project->first(pkey); int pos = name.indexOf('/');
if (pos > 0)
name = name.mid(0, pos);
symlinks[Option::fixPathToLocalOS(path + name)] =
project->first(vkey) + "/Current/" + name;
path += version; path += version;
} }
path += project->first(pkey).toQString(); path += project->first(pkey).toQString();