feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix behavior with no_plugin_name_prefix in CONFIG

Browse Source 
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: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Risto Avila
2016-10-05 13:25:35 +03:00
parent c0193701e9
commit 8579e684df
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -1471,7 +1471,9 @@ void QmakeProject::collectLibraryData(const QmakeProFileNode *node, DeploymentDa
destDir.append(QLatin1Char('/')).append(ti.target) destDir.append(QLatin1Char('/')).append(ti.target)
.append(QLatin1String(".framework")); .append(QLatin1String(".framework"));
} else { } else {
targetFileName.prepend(QLatin1String("lib")); if (!(isPlugin && config.contains(QLatin1String("no_plugin_name_prefix"))))
targetFileName.prepend(QLatin1String("lib"));
if (!isPlugin) { if (!isPlugin) {
targetFileName += QLatin1Char('.'); targetFileName += QLatin1Char('.');
const QString version = node->singleVariableValue(VersionVar); const QString version = node->singleVariableValue(VersionVar);
@@ -1490,7 +1492,9 @@ void QmakeProject::collectLibraryData(const QmakeProFileNode *node, DeploymentDa
case Abi::LinuxOS: case Abi::LinuxOS:
case Abi::BsdOS: case Abi::BsdOS:
case Abi::UnixOS: case Abi::UnixOS:
targetFileName.prepend(QLatin1String("lib")); if (!(isPlugin && config.contains(QLatin1String("no_plugin_name_prefix"))))
targetFileName.prepend(QLatin1String("lib"));
targetFileName += QLatin1Char('.'); targetFileName += QLatin1Char('.');
if (isStatic) { if (isStatic) {
targetFileName += QLatin1Char('a'); targetFileName += QLatin1Char('a');