diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index e39248eb137..30edb8535e4 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -57,9 +57,9 @@ add the Qt version for the embedded Linux. - \o Select \gui {Tools > Options > Build & Run > Tool Chains > Add} to - add the tool - chain for building the applications. + \o Select \gui {Tools > Options > Build & Run > Compilers > Add} to + add the compiler + for building the applications. \o To deploy applications and run them remotely on devices, specify parameters for accessing the devices: diff --git a/doc/src/projects/creator-projects-tool-chains.qdoc b/doc/src/projects/creator-projects-compilers.qdoc similarity index 97% rename from doc/src/projects/creator-projects-tool-chains.qdoc rename to doc/src/projects/creator-projects-compilers.qdoc index 040625fe997..f30c10deb2e 100644 --- a/doc/src/projects/creator-projects-tool-chains.qdoc +++ b/doc/src/projects/creator-projects-compilers.qdoc @@ -29,7 +29,7 @@ \page creator-tool-chains.html \nextpage creator-run-settings.html - \title Adding Tool Chains + \title Adding Compilers A \e {tool chain} specifies a compiler and other necessary tools for building an application that is \l{glossary-development-target} @@ -68,7 +68,7 @@ \list 1 - \o Select \gui {Tools > Options > Build & Run > Tool Chains > Add} and + \o Select \gui {Tools > Options > Build & Run > Compilers > Add} and select a compiler in the list. diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc index 293e7f0021b..8e5e1d7a0f4 100644 --- a/doc/src/projects/creator-projects-settings-build.qdoc +++ b/doc/src/projects/creator-projects-settings-build.qdoc @@ -194,7 +194,7 @@ \o \l{Adding Targets} \o \l{Adding Qt Versions} - \o \l{Adding Tool Chains} + \o \l{Adding Compilers} \endlist diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc index e47a409f312..34005fa0af4 100644 --- a/doc/src/projects/creator-projects-targets.qdoc +++ b/doc/src/projects/creator-projects-targets.qdoc @@ -88,7 +88,7 @@ \o In the \gui {Tool chain} field, select the tool chain required to build the project. You can add tool chains to the list if they are installed on the development PC, but were not detected - automatically. For more information, see \l{Adding Tool Chains}. + automatically. For more information, see \l{Adding Compilers}. \o In the \gui {Debugger command} field, specify the path to the debugger command. On Windows, specify the path to the Windows diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index 01fcb0e7404..0e8d3214af7 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -171,7 +171,7 @@ \list \o \l{Adding Targets} \o \l{Adding Qt Versions} - \o \l{Adding Tool Chains} + \o \l{Adding Compilers} \endlist \o \l{Specifying Run Settings} \o \l{Specifying Editor Settings} diff --git a/src/plugins/projectexplorer/profileinformation.cpp b/src/plugins/projectexplorer/profileinformation.cpp index 29a90d8811e..7a31baf4e93 100644 --- a/src/plugins/projectexplorer/profileinformation.cpp +++ b/src/plugins/projectexplorer/profileinformation.cpp @@ -187,7 +187,7 @@ QString ToolChainProfileInformation::displayNamePostfix(const Profile *p) const ProfileInformation::ItemList ToolChainProfileInformation::toUserOutput(Profile *p) const { ToolChain *tc = toolChain(p); - return ItemList() << qMakePair(tr("Tool chain"), tc ? tc->displayName() : tr("None")); + return ItemList() << qMakePair(tr("Compiler"), tc ? tc->displayName() : tr("None")); } void ToolChainProfileInformation::addToEnvironment(const Profile *p, Utils::Environment &env) const @@ -212,7 +212,7 @@ void ToolChainProfileInformation::setToolChain(Profile *p, ToolChain *tc) QString ToolChainProfileInformation::msgNoToolChainInTarget() { - return tr("No tool chain set in target."); + return tr("No compiler set in target."); } // -------------------------------------------------------------------------- diff --git a/src/plugins/projectexplorer/profileinformationconfigwidget.cpp b/src/plugins/projectexplorer/profileinformationconfigwidget.cpp index c354b6f8866..d480f563c2f 100644 --- a/src/plugins/projectexplorer/profileinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/profileinformationconfigwidget.cpp @@ -112,8 +112,8 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Profile *p, Q m_isReadOnly(false), m_profile(p), m_comboBox(new QComboBox), m_manageButton(new QPushButton(this)) { - setToolTip(tr("The tool chain to use for building.
" - "Make sure the tool chains will produce binaries compatible with the target device, " + setToolTip(tr("The compiler to use for building.
" + "Make sure the compiler will produce binaries compatible with the target device, " "Qt version and other libraries used.")); ToolChainManager *tcm = ToolChainManager::instance(); @@ -146,7 +146,7 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Profile *p, Q QString ToolChainInformationConfigWidget::displayName() const { - return tr("Tool chain:"); + return tr("Compiler:"); } void ToolChainInformationConfigWidget::apply() @@ -214,7 +214,7 @@ void ToolChainInformationConfigWidget::updateComboBox() m_comboBox->removeItem(pos); if (m_comboBox->count() == 0) { - m_comboBox->addItem(tr(""), QString()); + m_comboBox->addItem(tr(""), QString()); m_comboBox->setEnabled(false); } else { m_comboBox->setEnabled(!m_isReadOnly); diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index ab9588dee18..41ec7fb7203 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -270,7 +270,7 @@ QList ToolChainManager::restoreToolChains(const QString &fileName) } } if (!restored) - qWarning("Warning: Unable to restore tool chain '%s' stored in %s.", + qWarning("Warning: Unable to restore compiler '%s' stored in %s.", qPrintable(ToolChainFactory::idFromMap(tcMap)), qPrintable(QDir::toNativeSeparators(fileName))); } diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 9a3be078714..051dd6ee366 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -310,16 +310,16 @@ void ToolChainModel::apply() if (removedTcs.count() == 1) { QMessageBox::warning(0, - tr("Duplicate Tool Chain detected"), - tr("The following tool chain was already configured:
" + tr("Duplicate compilers detected"), + tr("The following compiler was already configured:
" " %1
" "It was not configured again.") .arg(removedTcs.at(0))); } else if (!removedTcs.isEmpty()) { QMessageBox::warning(0, - tr("Duplicate Tool Chains detected"), - tr("The following tool chains were already configured:
" + tr("Duplicate compilers detected"), + tr("The following compilers were already configured:
" " %1
" "They were not configured again.") .arg(removedTcs.join(QLatin1String(",
 ")))); @@ -444,7 +444,7 @@ ToolChainOptionsPage::ToolChainOptionsPage() : m_addButton(0), m_cloneButton(0), m_delButton(0) { setId(QLatin1String(Constants::TOOLCHAIN_SETTINGS_PAGE_ID)); - setDisplayName(tr("Tool Chains")); + setDisplayName(tr("Compilers")); setCategory(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY)); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); @@ -528,7 +528,7 @@ QWidget *ToolChainOptionsPage::createPage(QWidget *parent) if (m_searchKeywords.isEmpty()) { QLatin1Char sep(' '); QTextStream stream(&m_searchKeywords); - stream << tr("Tool Chains"); + stream << tr("Compilers"); foreach (ToolChainFactory *f, m_factories) stream << sep << f->displayName(); diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 94a37123036..028ab169d6a 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -145,7 +145,7 @@ bool MakeStep::init() m_tasks.clear(); if (!bc) { - m_tasks.append(Task(Task::Error, tr("Qt Creator needs a build configuration set up to build. Configure a tool chain in Project mode."), + m_tasks.append(Task(Task::Error, tr("Qt Creator needs a build configuration set up to build. Configure a target in Project mode."), Utils::FileName(), -1, Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))); return true; // otherwise the tasks will not get reported @@ -153,7 +153,7 @@ bool MakeStep::init() ToolChain *tc = ToolChainProfileInformation::toolChain(target()->profile()); if (!tc) { - m_tasks.append(Task(Task::Error, tr("Qt Creator needs a tool chain set up to build. Configure a tool chain in the target options."), + m_tasks.append(Task(Task::Error, tr("Qt Creator needs a compiler set up to build. Configure a compiler in the target options."), Utils::FileName(), -1, Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))); return true; // otherwise the tasks will not get reported diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 76539bef173..92f55eaece8 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -316,7 +316,7 @@ QList BaseQtVersion::validateProfile(const ProjectExplore qtAbiString.append(qtAbi.toString()); } const QString message = QCoreApplication::translate("BaseQtVersion", - "The tool chain '%1' (%2) cannot produce code for the Qt version '%3' (%4)."). + "The compiler'%1' (%2) cannot produce code for the Qt version '%3' (%4)."). arg(tc->displayName(), tc->targetAbi().toString(), version->displayName(), @@ -396,7 +396,7 @@ QStringList BaseQtVersion::warningReason() const { QStringList ret; if (qtAbis().count() == 1 && qtAbis().first().isNull()) - ret << QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching tool chain when building."); + ret << QCoreApplication::translate("QtVersion", "ABI detection failed: Make sure to use a matching compiler when building."); if (m_versionInfo.value(QLatin1String("QT_INSTALL_PREFIX/get")) != m_versionInfo.value(QLatin1String("QT_INSTALL_PREFIX"))) { ret << QCoreApplication::translate("QtVersion", "Non-installed -prefix build - for internal development only."); diff --git a/src/plugins/qtsupport/debugginghelper.ui b/src/plugins/qtsupport/debugginghelper.ui index a982d81ac25..56c484de5c5 100644 --- a/src/plugins/qtsupport/debugginghelper.ui +++ b/src/plugins/qtsupport/debugginghelper.ui @@ -140,7 +140,7 @@ - Tool chain: + Compiler: diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index aba338421a8..d677d1020b1 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -381,12 +381,12 @@ QtOptionsPageWidget::ValidityInfo QtOptionsPageWidget::validInformation(const Ba if (!missingToolChains.isEmpty()) { if (missingToolChains.count() == abiCount) { // Yes, this Qt version can't be used at all! - info.message = tr("No tool chain can produce code for this Qt version. Please define one or more tool chains."); + info.message = tr("No compiler can produce code for this Qt version. Please define one or more compilers."); info.icon = m_invalidVersionIcon; useable = false; } else { // Yes, some ABIs are unsupported - warnings << tr("Not all possible target environments can be supported due to missing tool chains."); + warnings << tr("Not all possible target environments can be supported due to missing compilers."); info.toolTip = tr("The following ABIs are currently not supported:
  • %1
") .arg(missingToolChains.join(QLatin1String("
  • "))); info.icon = m_warningVersionIcon;