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

McuSupport: Adjust Kit parameters to changes for Qul 1.1

Browse Source 
Qt for MCUs 1.1 gets a new directory and build system structure. Sha
807a3d2 in the Qt for MCUs repository introduces the change.

This patch adjusts the parameters of the generated kits accordingly,
which means that Qt Creator (master/4.12-beta1) will from this commit on
not support Qt for MCUs 1.0.1, anymore.

Change-Id: I20ded1bc28a2ffe30b59e8bce4a17bc38bb76a79
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2020-02-06 00:17:04 +01:00
parent 93f722b922
commit 888d804826
3 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,10 +195,10 @@ void McuPackage::updateStatus()
m_infoLabel->setText(statusText);
}
McuTarget::McuTarget(const QString &vendor, const QString &model,
McuTarget::McuTarget(const QString &vendor, const QString &platform,
const QVector<McuPackage*> &packages)
: m_vendor(vendor)
, m_model(model)
, m_qulPlatform(platform)
, m_packages(packages)
{
}
@@ -208,11 +208,6 @@ QString McuTarget::vendor() const
return m_vendor;
}
QString McuTarget::model() const
{
return m_model;
}
QVector<McuPackage *> McuTarget::packages() const
{
return m_packages;
@@ -228,11 +223,6 @@ QString McuTarget::toolChainFile() const
return m_toolChainFile;
}
void McuTarget::setQulPlatform(const QString &qulPlatform)
{
m_qulPlatform = qulPlatform;
}
QString McuTarget::qulPlatform() const
{
return m_qulPlatform;
@@ -400,29 +390,30 @@ McuSupportOptions::McuSupportOptions(QObject *parent)
const QString vendorNxp = "NXP";
const QString vendorQt = "Qt";
const QString armGccToochainFile = "CMake/toolchain/armgcc.cmake";
// STM
auto mcuTarget = new McuTarget(vendorStm, "stm32f7508", stmEvalPackages);
mcuTarget->setToolChainFile("CMake/stm32f7508-discovery.cmake");
auto mcuTarget = new McuTarget(vendorStm, "STM32F7508-DISCOVERY", stmEvalPackages);
mcuTarget->setToolChainFile(armGccToochainFile);
mcuTarget->setColorDepth(32);
mcuTargets.append(mcuTarget);
mcuTarget = new McuTarget(vendorStm, "stm32f7508", stmEvalPackages);
mcuTarget->setToolChainFile("CMake/stm32f7508-discovery.cmake");
mcuTarget = new McuTarget(vendorStm, "STM32F7508-DISCOVERY", stmEvalPackages);
mcuTarget->setToolChainFile(armGccToochainFile);
mcuTarget->setColorDepth(16);
mcuTargets.append(mcuTarget);
mcuTarget = new McuTarget(vendorStm, "stm32f769i", stmEvalPackages);
mcuTarget->setToolChainFile("CMake/stm32f769i-discovery.cmake");
mcuTarget = new McuTarget(vendorStm, "STM32F769I-DISCOVERY", stmEvalPackages);
mcuTarget->setToolChainFile(armGccToochainFile);
mcuTargets.append(mcuTarget);
// NXP
mcuTarget = new McuTarget(vendorNxp, "evkbimxrt1050", nxpEvalPackages);
mcuTarget->setToolChainFile("CMake/evkbimxrt1050-toolchain.cmake");
mcuTarget = new McuTarget(vendorNxp, "MIMXRT1050-EVK", nxpEvalPackages);
mcuTarget->setToolChainFile(armGccToochainFile);
mcuTargets.append(mcuTarget);
// Desktop
mcuTarget = new McuTarget(vendorQt, "Desktop", desktopPackages);
mcuTarget->setQulPlatform("Qt");
// Desktop (Qt)
mcuTarget = new McuTarget(vendorQt, "Qt", desktopPackages);
mcuTarget->setColorDepth(32);
mcuTargets.append(mcuTarget);
@@ -485,7 +476,7 @@ static void setKitProperties(const QString &kitName, ProjectExplorer::Kit *k,
k->setUnexpandedDisplayName(kitName);
k->setValue(Constants::KIT_MCUTARGET_VENDOR_KEY, mcuTarget->vendor());
k->setValue(Constants::KIT_MCUTARGET_MODEL_KEY, mcuTarget->model());
k->setValue(Constants::KIT_MCUTARGET_MODEL_KEY, mcuTarget->qulPlatform());
k->setAutoDetected(true);
k->makeSticky();
if (mcuTargetIsDesktop(mcuTarget)) {
@@ -576,9 +567,10 @@ static void setKitCMakeOptions(ProjectExplorer::Kit *k, const McuTarget* mcuTarg
if (!mcuTarget->toolChainFile().isEmpty())
config.append(CMakeConfigItem("CMAKE_TOOLCHAIN_FILE",
(qulDir + "/" + mcuTarget->toolChainFile()).toUtf8()));
if (!mcuTarget->qulPlatform().isEmpty())
config.append(CMakeConfigItem("QUL_PLATFORM",
mcuTarget->qulPlatform().toUtf8()));
config.append(CMakeConfigItem("QUL_GENERATORS",
(qulDir + "/CMake/QulGenerators.cmake").toUtf8()));
config.append(CMakeConfigItem("QUL_PLATFORM",
mcuTarget->qulPlatform().toUtf8()));
if (mcuTargetIsDesktop(mcuTarget))
config.append(CMakeConfigItem("CMAKE_PREFIX_PATH", "%{Qt:QT_INSTALL_PREFIX}"));
if (mcuTarget->colorDepth() >= 0)
@@ -598,8 +590,8 @@ QString McuSupportOptions::kitName(const McuTarget *mcuTarget) const
const QString colorDepth = mcuTarget->colorDepth() > 0
? QString::fromLatin1(" %1bpp").arg(mcuTarget->colorDepth())
: "";
return QString::fromLatin1("Qt for MCUs - %1 %2%3")
.arg(mcuTarget->vendor(), mcuTarget->model(), colorDepth);
return QString::fromLatin1("Qt for MCUs - %1%2")
.arg(mcuTarget->qulPlatform(), colorDepth);
}
QList<ProjectExplorer::Kit *> McuSupportOptions::existingKits(const McuTarget *mcuTargt)

7
src/plugins/mcusupport/mcusupportoptions.h
View File

@@ -100,14 +100,12 @@ class McuTarget : public QObject
Q_OBJECT
public:
McuTarget(const QString &vendor, const QString &model, const QVector<McuPackage *> &packages);
McuTarget(const QString &vendor, const QString &platform, const QVector<McuPackage *> &packages);
QString vendor() const;
QString model() const;
QVector<McuPackage *> packages() const;
void setToolChainFile(const QString &toolChainFile);
QString toolChainFile() const;
void setQulPlatform(const QString &qulPlatform);
QString qulPlatform() const;
void setColorDepth(int colorDepth);
int colorDepth() const;
@@ -115,10 +113,9 @@ public:
private:
const QString m_vendor;
const QString m_model;
const QString m_qulPlatform;
const QVector<McuPackage*> m_packages;
QString m_toolChainFile;
QString m_qulPlatform;
int m_colorDepth = -1;
};

3
src/plugins/mcusupport/wizards/application/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.13)
project(%{ProjectName} VERSION 0.0.1 LANGUAGES CXX)
project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM)
find_package(Qul)
@@ -8,3 +8,4 @@ add_executable(%{ProjectName})
qul_target_qml_sources(%{ProjectName} %{MainQmlFile})
target_link_libraries(%{ProjectName} Qul::QuickUltralite)
app_target_setup_os(%{ProjectName})