Commit 8579e684 authored by Risto Avila's avatar Risto Avila

Fix behavior with no_plugin_name_prefix in CONFIG

If both plugin and no_plugin_name_prefix are defined in CONFIG, QtCreator
would not assemble the file name correctly.

Change-Id: Iebfc0402ff7c89f2a964cfcee77dfc77a6e5b0db
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
parent c0193701
......@@ -1471,7 +1471,9 @@ void QmakeProject::collectLibraryData(const QmakeProFileNode *node, DeploymentDa
destDir.append(QLatin1Char('/')).append(ti.target)
.append(QLatin1String(".framework"));
} else {
targetFileName.prepend(QLatin1String("lib"));
if (!(isPlugin && config.contains(QLatin1String("no_plugin_name_prefix"))))
targetFileName.prepend(QLatin1String("lib"));
if (!isPlugin) {
targetFileName += QLatin1Char('.');
const QString version = node->singleVariableValue(VersionVar);
......@@ -1490,7 +1492,9 @@ void QmakeProject::collectLibraryData(const QmakeProFileNode *node, DeploymentDa
case Abi::LinuxOS:
case Abi::BsdOS:
case Abi::UnixOS:
targetFileName.prepend(QLatin1String("lib"));
if (!(isPlugin && config.contains(QLatin1String("no_plugin_name_prefix"))))
targetFileName.prepend(QLatin1String("lib"));
targetFileName += QLatin1Char('.');
if (isStatic) {
targetFileName += QLatin1Char('a');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment