From 1934119c427078be2ac4e39bf2ba039429a78984 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 11 Dec 2018 14:07:27 +0100 Subject: [PATCH] QmakeProjectManager: Consider unversioned_libname CONFIG value ... when calculating the installation targets. Fixes: QTCREATORBUG-21687 Change-Id: Ie56ce8b8f21d4ee8ddde983eb3731c5ce5ad0693 Reviewed-by: Karim Pinter Reviewed-by: Eike Ziller --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index abaf48d88a0..8ee25725205 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1175,6 +1175,7 @@ void QmakeProject::collectLibraryData(const QmakeProFile *file, DeploymentData & const QStringList config = file->variableValue(Variable::Config); const bool isStatic = config.contains(QLatin1String("static")); const bool isPlugin = config.contains(QLatin1String("plugin")); + const bool nameIsVersioned = !isPlugin && !config.contains("unversioned_libname"); switch (toolchain->targetAbi().os()) { case Abi::WindowsOS: { QString targetVersionExt = file->singleVariableValue(Variable::TargetVersionExt); @@ -1199,7 +1200,7 @@ void QmakeProject::collectLibraryData(const QmakeProFile *file, DeploymentData & if (!(isPlugin && config.contains(QLatin1String("no_plugin_name_prefix")))) targetFileName.prepend(QLatin1String("lib")); - if (!isPlugin) { + if (nameIsVersioned) { targetFileName += QLatin1Char('.'); const QString version = file->singleVariableValue(Variable::Version); QString majorVersion = version.left(version.indexOf(QLatin1Char('.'))); @@ -1227,7 +1228,7 @@ void QmakeProject::collectLibraryData(const QmakeProFile *file, DeploymentData & } else { targetFileName += QLatin1String("so"); deploymentData.addFile(destDirFor(ti).toString() + '/' + targetFileName, targetPath); - if (!isPlugin) { + if (nameIsVersioned) { QString version = file->singleVariableValue(Variable::Version); if (version.isEmpty()) version = QLatin1String("1.0.0");