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

qmake: Place Info.plist in correct location for plugin bundles

Browse Source 
Like application bundles on OSX, the plugin bundle has its Info.plist
in the Contents directory.

Change-Id: I216fa79857924beb0e9c5fcc4a8d06b197a3f383
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Tor Arne Vestbø 2015-05-12 14:01:14 +02:00
parent 5926d7422e
commit 34adfc1372
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -807,11 +807,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
} else { } else {
info_plist = escapeFilePath(fileFixify(info_plist)); info_plist = escapeFilePath(fileFixify(info_plist));
} }
bool isApp = (project->first("TEMPLATE") == "app"); bool isFramework = project->first("TEMPLATE") == "lib" && project->isActiveConfig("lib_bundle");
QString info_plist_out = QString info_plist_out = bundle_dir +
bundle_dir + (isApp ? "Contents/Info.plist" (isFramework ? ("Versions/" + project->first("QMAKE_FRAMEWORK_VERSION") + "/Resources/Info.plist")
: "Versions/" + project->first("QMAKE_FRAMEWORK_VERSION") : "Contents/Info.plist");
+ "/Resources/Info.plist");
bundledFiles << info_plist_out; bundledFiles << info_plist_out;
alldeps << info_plist_out; alldeps << info_plist_out;
QString destdir = info_plist_out.section(Option::dir_sep, 0, -2); QString destdir = info_plist_out.section(Option::dir_sep, 0, -2);
@ -842,7 +841,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
bundleIdentifier.chop(10); bundleIdentifier.chop(10);
commonSedArgs << "-e \"s,@BUNDLEIDENTIFIER@," << bundleIdentifier << ",g\" "; commonSedArgs << "-e \"s,@BUNDLEIDENTIFIER@," << bundleIdentifier << ",g\" ";
if (isApp) { if (!isFramework) {
QString icon = fileFixify(var("ICON")); QString icon = fileFixify(var("ICON"));
t << "@$(DEL_FILE) " << info_plist_out << "\n\t" t << "@$(DEL_FILE) " << info_plist_out << "\n\t"
<< "@sed "; << "@sed ";
@ -850,6 +849,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << arg; t << arg;
t << "-e \"s,@ICON@," << icon.section(Option::dir_sep, -1) << ",g\" " t << "-e \"s,@ICON@," << icon.section(Option::dir_sep, -1) << ",g\" "
<< "-e \"s,@EXECUTABLE@," << var("QMAKE_ORIG_TARGET") << ",g\" " << "-e \"s,@EXECUTABLE@," << var("QMAKE_ORIG_TARGET") << ",g\" "
<< "-e \"s,@LIBRARY@," << var("QMAKE_ORIG_TARGET") << ",g\" "
<< "-e \"s,@TYPEINFO@,"<< (project->isEmpty("QMAKE_PKGINFO_TYPEINFO") ? << "-e \"s,@TYPEINFO@,"<< (project->isEmpty("QMAKE_PKGINFO_TYPEINFO") ?
QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4)) << ",g\" " QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4)) << ",g\" "
<< "" << info_plist << " >" << info_plist_out << endl; << "" << info_plist << " >" << info_plist_out << endl;