From 8579e684dfdc413fdedac12b0234eadad599b735 Mon Sep 17 00:00:00 2001 From: Risto Avila Date: Wed, 5 Oct 2016 13:25:35 +0300 Subject: [PATCH] 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: Oswald Buddenhagen --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index d286ca37205..b3c54f4d1ff 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -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');