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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I403b236c40d73a61ae22304e289e9d4374366395
This commit is contained in:
Eike Ziller
2021-04-06 15:17:40 +02:00
parent 1c50f441a2 a8d9fb0e6e
commit c0cfafdd3d
221 changed files with 4167 additions and 3192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -431,9 +431,7 @@ RunConfigurationFactory::~RunConfigurationFactory()
QString RunConfigurationFactory::decoratedTargetName(const QString &targetName, Target *target)
{
QString displayName;
if (!targetName.isEmpty())
displayName = QFileInfo(targetName).completeBaseName();
QString displayName = targetName;
Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(target->kit());
if (devType != Constants::DESKTOP_DEVICE_TYPE) {
if (IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit())) {