qmake: tighten up isFramework check so it doesn't match plugin bundles
Plugin bundles are not frameworks, so this fixes the case where a lib template with plugin and lib_bundle in the CONFIG would be mistaken for a framework bundle, which has a different filesystem layout and handling. Change-Id: I9ce9daf22d4e3de70bfe7bc8bb219068de0bca42 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
parent
aae7a5e09d
commit
3666fc674f
@ -778,7 +778,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
|
||||
} else {
|
||||
info_plist = escapeFilePath(fileFixify(info_plist));
|
||||
}
|
||||
bool isFramework = project->first("TEMPLATE") == "lib" && project->isActiveConfig("lib_bundle");
|
||||
bool isFramework = project->first("TEMPLATE") == "lib"
|
||||
&& !project->isActiveConfig("plugin")
|
||||
&& project->isActiveConfig("lib_bundle");
|
||||
bool isShallowBundle = project->isActiveConfig("shallow_bundle");
|
||||
QString info_plist_out = bundle_dir +
|
||||
(!isShallowBundle
|
||||
|
Loading…
Reference in New Issue
Block a user