diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-25 19:15:27 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-01 10:56:55 +0200 |
| commit | 9cd9dfb0b1203c1c00356f5fdd7905888b6f7021 (patch) | |
| tree | 8ac0ab93b0030d99796bcb8fe3f42e1c6e507323 /qmake | |
| parent | 6c6b5ff8fb8dfdc9f9057e4d9db5f467131a3a04 (diff) | |
don't try to create nested top-level bundle dir symlinks
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 556036b692..27ffb9f40d 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -811,8 +811,12 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) if (!project->isEmpty(vkey)) { QString version = project->first(vkey) + "/" + project->first("QMAKE_FRAMEWORK_VERSION") + "/"; - symlinks[Option::fixPathToLocalOS(path + project->first(pkey))] = - project->first(vkey) + "/Current/" + project->first(pkey); + ProString name = 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 += project->first(pkey).toQString(); |