forked from qt-creator/qt-creator
Json Wizard: Do not write .user files for subprojects
Delay till subprojects are handled and only create .user files for those projects that are not a subproject. Change-Id: I606acbce5a9a8ca7c033f94869e796edd88d6c1e Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
@@ -55,7 +55,7 @@ void JsonKitsPage::initializePage()
|
|||||||
JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
|
JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
|
||||||
QTC_ASSERT(wiz, return);
|
QTC_ASSERT(wiz, return);
|
||||||
|
|
||||||
connect(wiz, &JsonWizard::filesReady, this, &JsonKitsPage::setupProjectFiles);
|
connect(wiz, &JsonWizard::allDone, this, &JsonKitsPage::setupProjectFiles);
|
||||||
|
|
||||||
const QString platform = wiz->stringValue(QLatin1String("Platform"));
|
const QString platform = wiz->stringValue(QLatin1String("Platform"));
|
||||||
const Core::FeatureSet preferred = Core::FeatureSet::fromStringList(wiz->value(QLatin1String("PreferredFeatures")).toStringList());
|
const Core::FeatureSet preferred = Core::FeatureSet::fromStringList(wiz->value(QLatin1String("PreferredFeatures")).toStringList());
|
||||||
@@ -73,7 +73,7 @@ void JsonKitsPage::cleanupPage()
|
|||||||
JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
|
JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
|
||||||
QTC_ASSERT(wiz, return);
|
QTC_ASSERT(wiz, return);
|
||||||
|
|
||||||
disconnect(wiz, &JsonWizard::filesReady, this, 0);
|
disconnect(wiz, &JsonWizard::allDone, this, 0);
|
||||||
|
|
||||||
TargetSetupPage::cleanupPage();
|
TargetSetupPage::cleanupPage();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user