1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix omission of QMAKE_PKGINFO from sliced bundles

Browse Source 
Change-Id: Iff2c6686eae47e09fa6d046c60523aaf79aadfd5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-09-25 19:06:21 +02:00
parent d6444b2e56
commit 9fb663e57f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -706,6 +706,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
QString bundle_dir = project->first("DESTDIR") + project->first("QMAKE_BUNDLE") + "/"; QString bundle_dir = project->first("DESTDIR") + project->first("QMAKE_BUNDLE") + "/";
if (!project->first("QMAKE_PKGINFO").isEmpty()) { if (!project->first("QMAKE_PKGINFO").isEmpty()) {
ProString pkginfo = escapeFilePath(project->first("QMAKE_PKGINFO")); ProString pkginfo = escapeFilePath(project->first("QMAKE_PKGINFO"));
bundledFiles << pkginfo;
QString destdir = bundle_dir + "Contents"; QString destdir = bundle_dir + "Contents";
t << pkginfo << ": \n\t"; t << pkginfo << ": \n\t";
if (!destdir.isEmpty()) if (!destdir.isEmpty())