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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I7d55c01489dfcdd26fcf3ced9f26539a09073e8c
This commit is contained in:
Orgad Shaneh
2021-02-06 22:35:18 +02:00
parent 55945c3307 bd25785997
commit dad2b3d84b
7 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -559,13 +559,6 @@ FilePath McuSupportOptions::qulDirFromSettings()
QSettings::UserScope));
}
static FilePath jomExecutablePath()
{
return HostOsInfo::isWindowsHost()
? FilePath::fromUserInput(Core::ICore::libexecPath() + "/jom.exe")
: FilePath();
}
static void setKitProperties(const QString &kitName, Kit *k, const McuTarget *mcuTarget)
{
using namespace Constants;
@@ -585,8 +578,6 @@ static void setKitProperties(const QString &kitName, Kit *k, const McuTarget *mc
QSet<Id> irrelevant = { SysRootKitAspect::id() };
if (!kitNeedsQtVersion())
irrelevant.insert(QtSupport::QtKitAspect::id());
if (jomExecutablePath().exists()) // TODO: add id() getter to CMakeGeneratorKitAspect
irrelevant.insert("CMake.GeneratorKitInformation");
k->setIrrelevantAspects(irrelevant);
}
@@ -690,11 +681,6 @@ static void setKitCMakeOptions(Kit *k, const McuTarget* mcuTarget, const QString
if (mcuTarget->colorDepth() >= 0)
config.append(CMakeConfigItem("QUL_COLOR_DEPTH",
QString::number(mcuTarget->colorDepth()).toLatin1()));
const FilePath jom = jomExecutablePath();
if (jom.exists()) {
config.append(CMakeConfigItem("CMAKE_MAKE_PROGRAM", jom.toString().toLatin1()));
CMakeGeneratorKitAspect::setGenerator(k, "NMake Makefiles JOM");
}
if (kitNeedsQtVersion())
config.append(CMakeConfigItem("CMAKE_PREFIX_PATH", "%{Qt:QT_INSTALL_PREFIX}"));
CMakeConfigurationKitAspect::setConfiguration(k, config);