forked from qt-creator/qt-creator
Rename "Tool Chains" option page to "Compilers"
Currently it contains compiler settings only, so there's no need to let people search for e.g. debugger settings there, that might be considered part of the toolchain, too. Change-Id: I458f3d1cf1784b85820f8af7604a2a004372a909 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -57,9 +57,9 @@
|
|||||||
add the Qt version
|
add the Qt version
|
||||||
for the embedded Linux.
|
for the embedded Linux.
|
||||||
|
|
||||||
\o Select \gui {Tools > Options > Build & Run > Tool Chains > Add} to
|
\o Select \gui {Tools > Options > Build & Run > Compilers > Add} to
|
||||||
add the tool
|
add the compiler
|
||||||
chain for building the applications.
|
for building the applications.
|
||||||
|
|
||||||
\o To deploy applications and run them remotely on devices, specify
|
\o To deploy applications and run them remotely on devices, specify
|
||||||
parameters for accessing the devices:
|
parameters for accessing the devices:
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
\page creator-tool-chains.html
|
\page creator-tool-chains.html
|
||||||
\nextpage creator-run-settings.html
|
\nextpage creator-run-settings.html
|
||||||
|
|
||||||
\title Adding Tool Chains
|
\title Adding Compilers
|
||||||
|
|
||||||
A \e {tool chain} specifies a compiler and other necessary
|
A \e {tool chain} specifies a compiler and other necessary
|
||||||
tools for building an application that is \l{glossary-development-target}
|
tools for building an application that is \l{glossary-development-target}
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
|
|
||||||
\list 1
|
\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
|
select a
|
||||||
compiler in the list.
|
compiler in the list.
|
||||||
|
|
||||||
@@ -194,7 +194,7 @@
|
|||||||
|
|
||||||
\o \l{Adding Targets}
|
\o \l{Adding Targets}
|
||||||
\o \l{Adding Qt Versions}
|
\o \l{Adding Qt Versions}
|
||||||
\o \l{Adding Tool Chains}
|
\o \l{Adding Compilers}
|
||||||
|
|
||||||
\endlist
|
\endlist
|
||||||
|
|
||||||
|
|||||||
@@ -88,7 +88,7 @@
|
|||||||
\o In the \gui {Tool chain} field, select the tool chain required
|
\o In the \gui {Tool chain} field, select the tool chain required
|
||||||
to build the project. You can add tool chains to the list
|
to build the project. You can add tool chains to the list
|
||||||
if they are installed on the development PC, but were not detected
|
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
|
\o In the \gui {Debugger command} field, specify the path to the
|
||||||
debugger command. On Windows, specify the path to the Windows
|
debugger command. On Windows, specify the path to the Windows
|
||||||
|
|||||||
@@ -171,7 +171,7 @@
|
|||||||
\list
|
\list
|
||||||
\o \l{Adding Targets}
|
\o \l{Adding Targets}
|
||||||
\o \l{Adding Qt Versions}
|
\o \l{Adding Qt Versions}
|
||||||
\o \l{Adding Tool Chains}
|
\o \l{Adding Compilers}
|
||||||
\endlist
|
\endlist
|
||||||
\o \l{Specifying Run Settings}
|
\o \l{Specifying Run Settings}
|
||||||
\o \l{Specifying Editor Settings}
|
\o \l{Specifying Editor Settings}
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ QString ToolChainProfileInformation::displayNamePostfix(const Profile *p) const
|
|||||||
ProfileInformation::ItemList ToolChainProfileInformation::toUserOutput(Profile *p) const
|
ProfileInformation::ItemList ToolChainProfileInformation::toUserOutput(Profile *p) const
|
||||||
{
|
{
|
||||||
ToolChain *tc = toolChain(p);
|
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
|
void ToolChainProfileInformation::addToEnvironment(const Profile *p, Utils::Environment &env) const
|
||||||
@@ -212,7 +212,7 @@ void ToolChainProfileInformation::setToolChain(Profile *p, ToolChain *tc)
|
|||||||
|
|
||||||
QString ToolChainProfileInformation::msgNoToolChainInTarget()
|
QString ToolChainProfileInformation::msgNoToolChainInTarget()
|
||||||
{
|
{
|
||||||
return tr("No tool chain set in target.");
|
return tr("No compiler set in target.");
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -112,8 +112,8 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Profile *p, Q
|
|||||||
m_isReadOnly(false), m_profile(p),
|
m_isReadOnly(false), m_profile(p),
|
||||||
m_comboBox(new QComboBox), m_manageButton(new QPushButton(this))
|
m_comboBox(new QComboBox), m_manageButton(new QPushButton(this))
|
||||||
{
|
{
|
||||||
setToolTip(tr("The tool chain to use for building.<br>"
|
setToolTip(tr("The compiler to use for building.<br>"
|
||||||
"Make sure the tool chains will produce binaries compatible with the target device, "
|
"Make sure the compiler will produce binaries compatible with the target device, "
|
||||||
"Qt version and other libraries used."));
|
"Qt version and other libraries used."));
|
||||||
ToolChainManager *tcm = ToolChainManager::instance();
|
ToolChainManager *tcm = ToolChainManager::instance();
|
||||||
|
|
||||||
@@ -146,7 +146,7 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Profile *p, Q
|
|||||||
|
|
||||||
QString ToolChainInformationConfigWidget::displayName() const
|
QString ToolChainInformationConfigWidget::displayName() const
|
||||||
{
|
{
|
||||||
return tr("Tool chain:");
|
return tr("Compiler:");
|
||||||
}
|
}
|
||||||
|
|
||||||
void ToolChainInformationConfigWidget::apply()
|
void ToolChainInformationConfigWidget::apply()
|
||||||
@@ -214,7 +214,7 @@ void ToolChainInformationConfigWidget::updateComboBox()
|
|||||||
m_comboBox->removeItem(pos);
|
m_comboBox->removeItem(pos);
|
||||||
|
|
||||||
if (m_comboBox->count() == 0) {
|
if (m_comboBox->count() == 0) {
|
||||||
m_comboBox->addItem(tr("<No tool chain available>"), QString());
|
m_comboBox->addItem(tr("<No compiler available>"), QString());
|
||||||
m_comboBox->setEnabled(false);
|
m_comboBox->setEnabled(false);
|
||||||
} else {
|
} else {
|
||||||
m_comboBox->setEnabled(!m_isReadOnly);
|
m_comboBox->setEnabled(!m_isReadOnly);
|
||||||
|
|||||||
@@ -270,7 +270,7 @@ QList<ToolChain *> ToolChainManager::restoreToolChains(const QString &fileName)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!restored)
|
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(ToolChainFactory::idFromMap(tcMap)),
|
||||||
qPrintable(QDir::toNativeSeparators(fileName)));
|
qPrintable(QDir::toNativeSeparators(fileName)));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -310,16 +310,16 @@ void ToolChainModel::apply()
|
|||||||
|
|
||||||
if (removedTcs.count() == 1) {
|
if (removedTcs.count() == 1) {
|
||||||
QMessageBox::warning(0,
|
QMessageBox::warning(0,
|
||||||
tr("Duplicate Tool Chain detected"),
|
tr("Duplicate compilers detected"),
|
||||||
tr("The following tool chain was already configured:<br>"
|
tr("The following compiler was already configured:<br>"
|
||||||
" %1<br>"
|
" %1<br>"
|
||||||
"It was not configured again.")
|
"It was not configured again.")
|
||||||
.arg(removedTcs.at(0)));
|
.arg(removedTcs.at(0)));
|
||||||
|
|
||||||
} else if (!removedTcs.isEmpty()) {
|
} else if (!removedTcs.isEmpty()) {
|
||||||
QMessageBox::warning(0,
|
QMessageBox::warning(0,
|
||||||
tr("Duplicate Tool Chains detected"),
|
tr("Duplicate compilers detected"),
|
||||||
tr("The following tool chains were already configured:<br>"
|
tr("The following compilers were already configured:<br>"
|
||||||
" %1<br>"
|
" %1<br>"
|
||||||
"They were not configured again.")
|
"They were not configured again.")
|
||||||
.arg(removedTcs.join(QLatin1String(",<br> "))));
|
.arg(removedTcs.join(QLatin1String(",<br> "))));
|
||||||
@@ -444,7 +444,7 @@ ToolChainOptionsPage::ToolChainOptionsPage() :
|
|||||||
m_addButton(0), m_cloneButton(0), m_delButton(0)
|
m_addButton(0), m_cloneButton(0), m_delButton(0)
|
||||||
{
|
{
|
||||||
setId(QLatin1String(Constants::TOOLCHAIN_SETTINGS_PAGE_ID));
|
setId(QLatin1String(Constants::TOOLCHAIN_SETTINGS_PAGE_ID));
|
||||||
setDisplayName(tr("Tool Chains"));
|
setDisplayName(tr("Compilers"));
|
||||||
setCategory(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY));
|
setCategory(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY));
|
||||||
setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
|
setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
|
||||||
Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY));
|
Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY));
|
||||||
@@ -528,7 +528,7 @@ QWidget *ToolChainOptionsPage::createPage(QWidget *parent)
|
|||||||
if (m_searchKeywords.isEmpty()) {
|
if (m_searchKeywords.isEmpty()) {
|
||||||
QLatin1Char sep(' ');
|
QLatin1Char sep(' ');
|
||||||
QTextStream stream(&m_searchKeywords);
|
QTextStream stream(&m_searchKeywords);
|
||||||
stream << tr("Tool Chains");
|
stream << tr("Compilers");
|
||||||
foreach (ToolChainFactory *f, m_factories)
|
foreach (ToolChainFactory *f, m_factories)
|
||||||
stream << sep << f->displayName();
|
stream << sep << f->displayName();
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ bool MakeStep::init()
|
|||||||
|
|
||||||
m_tasks.clear();
|
m_tasks.clear();
|
||||||
if (!bc) {
|
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,
|
Utils::FileName(), -1,
|
||||||
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
|
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
|
||||||
return true; // otherwise the tasks will not get reported
|
return true; // otherwise the tasks will not get reported
|
||||||
@@ -153,7 +153,7 @@ bool MakeStep::init()
|
|||||||
|
|
||||||
ToolChain *tc = ToolChainProfileInformation::toolChain(target()->profile());
|
ToolChain *tc = ToolChainProfileInformation::toolChain(target()->profile());
|
||||||
if (!tc) {
|
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,
|
Utils::FileName(), -1,
|
||||||
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
|
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
|
||||||
return true; // otherwise the tasks will not get reported
|
return true; // otherwise the tasks will not get reported
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ QList<ProjectExplorer::Task> BaseQtVersion::validateProfile(const ProjectExplore
|
|||||||
qtAbiString.append(qtAbi.toString());
|
qtAbiString.append(qtAbi.toString());
|
||||||
}
|
}
|
||||||
const QString message = QCoreApplication::translate("BaseQtVersion",
|
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(),
|
arg(tc->displayName(),
|
||||||
tc->targetAbi().toString(),
|
tc->targetAbi().toString(),
|
||||||
version->displayName(),
|
version->displayName(),
|
||||||
@@ -396,7 +396,7 @@ QStringList BaseQtVersion::warningReason() const
|
|||||||
{
|
{
|
||||||
QStringList ret;
|
QStringList ret;
|
||||||
if (qtAbis().count() == 1 && qtAbis().first().isNull())
|
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"))
|
if (m_versionInfo.value(QLatin1String("QT_INSTALL_PREFIX/get"))
|
||||||
!= m_versionInfo.value(QLatin1String("QT_INSTALL_PREFIX"))) {
|
!= m_versionInfo.value(QLatin1String("QT_INSTALL_PREFIX"))) {
|
||||||
ret << QCoreApplication::translate("QtVersion", "Non-installed -prefix build - for internal development only.");
|
ret << QCoreApplication::translate("QtVersion", "Non-installed -prefix build - for internal development only.");
|
||||||
|
|||||||
@@ -140,7 +140,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="toolChainLabel">
|
<widget class="QLabel" name="toolChainLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Tool chain:</string>
|
<string>Compiler:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -381,12 +381,12 @@ QtOptionsPageWidget::ValidityInfo QtOptionsPageWidget::validInformation(const Ba
|
|||||||
if (!missingToolChains.isEmpty()) {
|
if (!missingToolChains.isEmpty()) {
|
||||||
if (missingToolChains.count() == abiCount) {
|
if (missingToolChains.count() == abiCount) {
|
||||||
// Yes, this Qt version can't be used at all!
|
// 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;
|
info.icon = m_invalidVersionIcon;
|
||||||
useable = false;
|
useable = false;
|
||||||
} else {
|
} else {
|
||||||
// Yes, some ABIs are unsupported
|
// 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:<ul><li>%1</li></ul>")
|
info.toolTip = tr("The following ABIs are currently not supported:<ul><li>%1</li></ul>")
|
||||||
.arg(missingToolChains.join(QLatin1String("</li><li>")));
|
.arg(missingToolChains.join(QLatin1String("</li><li>")));
|
||||||
info.icon = m_warningVersionIcon;
|
info.icon = m_warningVersionIcon;
|
||||||
|
|||||||
Reference in New Issue
Block a user