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

Android: Remove missing Qt version warning

Browse Source 
Task-number: QTCREATORBUG-21421
Change-Id: I1442c574e6d9bcd7e407e07a6ce688ddf45e86f3
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Vikas Pachdha
2018-10-30 15:38:48 +01:00
parent c95b21ca17
commit dabe72b7bb
3 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/android/androidsettingswidget.cpp
View File

@@ -268,11 +268,6 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
m_ui->androidDetailsWidget); m_ui->androidDetailsWidget);
m_ui->androidDetailsWidget->setWidget(androidSummary); m_ui->androidDetailsWidget->setWidget(androidSummary);
auto kitsDetailsLabel = new QLabel(m_ui->kitWarningDetails);
kitsDetailsLabel->setWordWrap(true);
m_ui->kitWarningDetails->setWidget(kitsDetailsLabel);
m_ui->kitWarningDetails->setIcon(Utils::Icons::WARNING.icon());
m_ui->SDKLocationPathChooser->setFileName(m_androidConfig.sdkLocation()); m_ui->SDKLocationPathChooser->setFileName(m_androidConfig.sdkLocation());
m_ui->SDKLocationPathChooser->setPromptDialogTitle(tr("Select Android SDK folder")); m_ui->SDKLocationPathChooser->setPromptDialogTitle(tr("Select Android SDK folder"));
m_ui->NDKLocationPathChooser->setFileName(m_androidConfig.ndkLocation()); m_ui->NDKLocationPathChooser->setFileName(m_androidConfig.ndkLocation());
@@ -532,48 +527,6 @@ void AndroidSettingsWidget::createKitToggled()
m_androidConfig.setAutomaticKitCreation(m_ui->CreateKitCheckBox->isChecked()); m_androidConfig.setAutomaticKitCreation(m_ui->CreateKitCheckBox->isChecked());
} }
void AndroidSettingsWidget::checkMissingQtVersion()
{
auto summaryWidget = static_cast<SummaryWidget *>(m_ui->androidDetailsWidget->widget());
if (!summaryWidget->allRowsOk()) {
m_ui->kitWarningDetails->setVisible(false);
m_ui->kitWarningDetails->setState(Utils::DetailsWidget::Collapsed);
return;
}
QList<AndroidToolChainFactory::AndroidToolChainInformation> compilerPaths
= AndroidToolChainFactory::toolchainPathsForNdk(m_androidConfig.ndkLocation());
// See if we have qt versions for those toolchains
QSet<ProjectExplorer::Abi> toolchainsForAbi;
foreach (const AndroidToolChainFactory::AndroidToolChainInformation &ati, compilerPaths) {
if (ati.language == Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID))
toolchainsForAbi.insert(ati.abi);
}
const QList<QtSupport::BaseQtVersion *> androidQts
= QtSupport::QtVersionManager::versions([](const QtSupport::BaseQtVersion *v) {
return v->type() == QLatin1String(Constants::ANDROIDQT) && !v->qtAbis().isEmpty();
});
QSet<ProjectExplorer::Abi> qtVersionsForAbi;
foreach (QtSupport::BaseQtVersion *qtVersion, androidQts)
qtVersionsForAbi.insert(qtVersion->qtAbis().first());
QSet<ProjectExplorer::Abi> missingQtArchs = toolchainsForAbi.subtract(qtVersionsForAbi);
bool isArchMissing = !missingQtArchs.isEmpty();
m_ui->kitWarningDetails->setVisible(isArchMissing);
if (isArchMissing) {
m_ui->kitWarningDetails->setSummaryText(tr("Cannot create kits for all architectures."));
auto detailsLabel = static_cast<QLabel *>(m_ui->kitWarningDetails->widget());
QStringList archNames;
for (auto abi : missingQtArchs)
archNames << abi.toString();
detailsLabel->setText(tr("Qt versions are missing for the following architectures:\n%1"
"\n\nTo add the Qt version, select Options > Build & Run > Qt"
" Versions.").arg(archNames.join(", ")));
}
}
void AndroidSettingsWidget::updateUI() void AndroidSettingsWidget::updateUI()
{ {
auto javaSummaryWidget = static_cast<SummaryWidget *>(m_ui->javaDetailsWidget->widget()); auto javaSummaryWidget = static_cast<SummaryWidget *>(m_ui->javaDetailsWidget->widget());
@@ -596,7 +549,6 @@ void AndroidSettingsWidget::updateUI()
m_ui->androidDetailsWidget->setState(androidSetupOk ? Utils::DetailsWidget::Collapsed : m_ui->androidDetailsWidget->setState(androidSetupOk ? Utils::DetailsWidget::Collapsed :
Utils::DetailsWidget::Expanded); Utils::DetailsWidget::Expanded);
startUpdateAvd(); startUpdateAvd();
checkMissingQtVersion();
} }
void AndroidSettingsWidget::manageAVD() void AndroidSettingsWidget::manageAVD()

1
src/plugins/android/androidsettingswidget.h
View File

@@ -91,7 +91,6 @@ private:
void manageAVD(); void manageAVD();
void createKitToggled(); void createKitToggled();
void checkMissingQtVersion();
void updateUI(); void updateUI();
void updateAvds(); void updateAvds();

3
src/plugins/android/androidsettingswidget.ui
View File

@@ -183,9 +183,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="Utils::DetailsWidget" name="kitWarningDetails" native="true"/>
</item>
<item> <item>
<widget class="QTabWidget" name="managerTabWidget"> <widget class="QTabWidget" name="managerTabWidget">
<property name="currentIndex"> <property name="currentIndex">