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

QmlDesigner: Show warning about invalid kit

Browse Source 
Task-number: QTCREATORBUG-12578
Change-Id: I4308518bc883d4665d09bb9340557f89f30dc371
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-07-01 12:01:18 +02:00
committed by Tim Jenssen
parent 1ac804528e
commit b49ba79973
1 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
View File

@@ -187,23 +187,38 @@ bool PuppetCreator::build(const QString &qmlPuppetProjectFilePath) const
return buildSucceeded; return buildSucceeded;
} }
static void warnAboutInvalidKit()
{
QmlDesignerWarning::show(QCoreApplication::translate("PuppetCreator", "Kit is invalid"),
QCoreApplication::translate("PuppetCreator",
"The emulation layer (Qml Puppet) cannot be built because the kit is not configured correctly. "
"For example the compiler can be misconfigured. "
"Fix the kit configuration and restart Qt Creator. "
"Otherwise, the fallback emulation layer, which does not support all features, will be used."
));
}
void PuppetCreator::createQml1PuppetExecutableIfMissing() void PuppetCreator::createQml1PuppetExecutableIfMissing()
{ {
if (!m_useOnlyFallbackPuppet && m_kit) { if (!m_useOnlyFallbackPuppet && m_kit) {
if (m_qml1PuppetForKitPuppetHash.contains(m_kit->id())) { if (m_qml1PuppetForKitPuppetHash.contains(m_kit->id())) {
m_availablePuppetType = m_qml1PuppetForKitPuppetHash.value(m_kit->id()); m_availablePuppetType = m_qml1PuppetForKitPuppetHash.value(m_kit->id());
} else if (checkQmlpuppetIsReady()) { } else if (checkQmlpuppetIsReady()) {
m_availablePuppetType = UserSpacePuppet;
} else {
bool buildSucceeded = build(qmlpuppetProjectFile());
if (buildSucceeded)
m_availablePuppetType = UserSpacePuppet; m_availablePuppetType = UserSpacePuppet;
else } else {
m_availablePuppetType = FallbackPuppet; if (m_kit->isValid()) {
}
m_qml1PuppetForKitPuppetHash.insert(m_kit->id(), m_availablePuppetType);
bool buildSucceeded = build(qmlpuppetProjectFile());
if (buildSucceeded)
m_availablePuppetType = UserSpacePuppet;
else
m_availablePuppetType = FallbackPuppet;
} else {
warnAboutInvalidKit();
m_availablePuppetType = FallbackPuppet;
}
m_qml1PuppetForKitPuppetHash.insert(m_kit->id(), m_availablePuppetType);
}
} else { } else {
m_availablePuppetType = FallbackPuppet; m_availablePuppetType = FallbackPuppet;
} }
@@ -212,20 +227,24 @@ void PuppetCreator::createQml1PuppetExecutableIfMissing()
void PuppetCreator::createQml2PuppetExecutableIfMissing() void PuppetCreator::createQml2PuppetExecutableIfMissing()
{ {
if (!m_useOnlyFallbackPuppet && m_kit) { if (!m_useOnlyFallbackPuppet && m_kit) {
if (m_qml2PuppetForKitPuppetHash.contains(m_kit->id())) { if (m_qml2PuppetForKitPuppetHash.contains(m_kit->id())) {
m_availablePuppetType = m_qml2PuppetForKitPuppetHash.value(m_kit->id()); m_availablePuppetType = m_qml2PuppetForKitPuppetHash.value(m_kit->id());
} else if (checkQml2puppetIsReady()) { } else if (checkQml2puppetIsReady()) {
m_availablePuppetType = UserSpacePuppet; m_availablePuppetType = UserSpacePuppet;
} else { } else {
bool buildSucceeded = build(qml2puppetProjectFile()); if (m_kit->isValid()) {
if (buildSucceeded) bool buildSucceeded = build(qml2puppetProjectFile());
m_availablePuppetType = UserSpacePuppet; if (buildSucceeded)
else m_availablePuppetType = UserSpacePuppet;
else
m_availablePuppetType = FallbackPuppet;
} else {
warnAboutInvalidKit();
m_availablePuppetType = FallbackPuppet; m_availablePuppetType = FallbackPuppet;
}
m_qml2PuppetForKitPuppetHash.insert(m_kit->id(), m_availablePuppetType);
} }
m_qml2PuppetForKitPuppetHash.insert(m_kit->id(), m_availablePuppetType);
} else { } else {
m_availablePuppetType = FallbackPuppet; m_availablePuppetType = FallbackPuppet;
} }