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

QmakeProjectManager: Consider unversioned_libname CONFIG value

Browse Source 
... when calculating the installation targets.

Fixes: QTCREATORBUG-21687
Change-Id: Ie56ce8b8f21d4ee8ddde983eb3731c5ce5ad0693
Reviewed-by: Karim Pinter <karim.pinter@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2018-12-11 14:07:27 +01:00
parent 81b6d4f637
commit 1934119c42
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1175,6 +1175,7 @@ void QmakeProject::collectLibraryData(const QmakeProFile *file, DeploymentData &
const QStringList config = file->variableValue(Variable::Config); const QStringList config = file->variableValue(Variable::Config);
const bool isStatic = config.contains(QLatin1String("static")); const bool isStatic = config.contains(QLatin1String("static"));
const bool isPlugin = config.contains(QLatin1String("plugin")); const bool isPlugin = config.contains(QLatin1String("plugin"));
const bool nameIsVersioned = !isPlugin && !config.contains("unversioned_libname");
switch (toolchain->targetAbi().os()) { switch (toolchain->targetAbi().os()) {
case Abi::WindowsOS: { case Abi::WindowsOS: {
QString targetVersionExt = file->singleVariableValue(Variable::TargetVersionExt); 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")))) if (!(isPlugin && config.contains(QLatin1String("no_plugin_name_prefix"))))
targetFileName.prepend(QLatin1String("lib")); targetFileName.prepend(QLatin1String("lib"));
if (!isPlugin) { if (nameIsVersioned) {
targetFileName += QLatin1Char('.'); targetFileName += QLatin1Char('.');
const QString version = file->singleVariableValue(Variable::Version); const QString version = file->singleVariableValue(Variable::Version);
QString majorVersion = version.left(version.indexOf(QLatin1Char('.'))); QString majorVersion = version.left(version.indexOf(QLatin1Char('.')));
@@ -1227,7 +1228,7 @@ void QmakeProject::collectLibraryData(const QmakeProFile *file, DeploymentData &
} else { } else {
targetFileName += QLatin1String("so"); targetFileName += QLatin1String("so");
deploymentData.addFile(destDirFor(ti).toString() + '/' + targetFileName, targetPath); deploymentData.addFile(destDirFor(ti).toString() + '/' + targetFileName, targetPath);
if (!isPlugin) { if (nameIsVersioned) {
QString version = file->singleVariableValue(Variable::Version); QString version = file->singleVariableValue(Variable::Version);
if (version.isEmpty()) if (version.isEmpty())
version = QLatin1String("1.0.0"); version = QLatin1String("1.0.0");