diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-08-18 03:16:15 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-08-25 11:01:39 +0000 |
| commit | 3666fc674f0def1f5deb29b4df085e00715ce3ca (patch) | |
| tree | e94afe9e6ff688c8f0387e01932dfe7a318877e2 /qmake | |
| parent | aae7a5e09db3d98ce74a523c06b8971a3672b309 (diff) | |
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index be476a7806..5d9bcf4ec2 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -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 |