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

QmakeProject: Don't deny deployment to not precisely known targets

Browse Source 
Fall back to what we do for Windows/Linux/BSD and the rest of
Unix anyway.

The target architecture/os detection process is conceptually
not precise. Refusing to do anything at all, including steps like
copying files which do not depend on precise architecture data
anyway, is overshooting.

Change-Id: Ic6c98c4dac5fe4a625149be558c8b02440f8fdbc
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
hjk
2014-10-02 14:45:14 +02:00
parent 78c707760e
commit 20f486281e
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1659,16 +1659,11 @@ QString QmakeProject::executableFor(const QmakeProFileNode *node)
break; break;
} }
// else fall through // else fall through
case ProjectExplorer::Abi::WindowsOS: default: {
case ProjectExplorer::Abi::LinuxOS:
case ProjectExplorer::Abi::BsdOS:
case ProjectExplorer::Abi::UnixOS: {
QString extension = node->singleVariableValue(TargetExtVar); QString extension = node->singleVariableValue(TargetExtVar);
target = ti.target + extension; target = ti.target + extension;
break; break;
} }
default:
return QString();
} }
return QDir(destDirFor(ti)).absoluteFilePath(target); return QDir(destDirFor(ti)).absoluteFilePath(target);
} }