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

External tools: Remove QLatin1String and fix various warnings

Browse Source 
Change-Id: I0781ee34e3bce9bbc000b87af33b3c8acfda6a77
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2018-09-25 15:51:57 +02:00
parent bca41fa9f6
commit d0f7789853
3 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
View File

@@ -532,8 +532,8 @@ void ExternalToolConfig::updateItem(const QModelIndex &index)
tool->setWorkingDirectory(ui->workingDirectory->rawPath());
tool->setBaseEnvironmentProviderId(Id::fromSetting(ui->baseEnvironment->currentData()));
tool->setEnvironmentUserChanges(m_environment);
tool->setOutputHandling((ExternalTool::OutputHandling)ui->outputBehavior->currentIndex());
tool->setErrorHandling((ExternalTool::OutputHandling)ui->errorOutputBehavior->currentIndex());
tool->setOutputHandling(ExternalTool::OutputHandling(ui->outputBehavior->currentIndex()));
tool->setErrorHandling(ExternalTool::OutputHandling(ui->errorOutputBehavior->currentIndex()));
tool->setModifiesCurrentDocument(ui->modifiesDocumentCheckbox->checkState());
tool->setInput(ui->inputText->toPlainText());
}
@@ -554,11 +554,12 @@ void ExternalToolConfig::showInfoForItem(const QModelIndex &index)
}
ui->infoWidget->setEnabled(true);
ui->description->setText(tool->description());
ui->executable->setPath(tool->executables().isEmpty() ? QString() : tool->executables().first());
ui->executable->setPath(tool->executables().isEmpty() ? QString()
: tool->executables().constFirst());
ui->arguments->setText(tool->arguments());
ui->workingDirectory->setPath(tool->workingDirectory());
ui->outputBehavior->setCurrentIndex((int)tool->outputHandling());
ui->errorOutputBehavior->setCurrentIndex((int)tool->errorHandling());
ui->outputBehavior->setCurrentIndex(int(tool->outputHandling()));
ui->errorOutputBehavior->setCurrentIndex(int(tool->errorHandling()));
ui->modifiesDocumentCheckbox->setChecked(tool->modifiesCurrentDocument());
const int baseEnvironmentIndex = ui->baseEnvironment->findData(
tool->baseEnvironmentProviderId().toSetting());