Commit 429ed63f authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Fix spelling of tool chain is user-visible strings and comments

parent e18d0496
......@@ -3679,7 +3679,7 @@
\gui{Qt Versions}.
\o Qt Creator automatically sets the correct environment variables for
compilation. Select the internal version number of the installed
Microsoft Visual C++ tool chain in the \gui Toolchain list.
Microsoft Visual C++ tool chain in the \gui tool chain list.
\image qtcreator-qt4-qtversions-win-msvc.png
......@@ -3704,12 +3704,12 @@
\image qtcreator-qt4-qtversions-win-symbian.png
\o To build an application for your device using GCCE, enter the path
to the CSL ARM toolchain directory in
to the CSL ARM tool chain directory in
\gui{CSL\\GCCE directory}.
You do not need to specify this path if the compiler is included in
the \c{PATH} environment variable.
\o To build an application for the emulator (WINSCW toolchain), enter
\o To build an application for the emulator (WINSCW tool chain), enter
the path to your Carbide C++ installation directory in
\gui{Carbide directory}.
......@@ -3717,7 +3717,7 @@
\o To build an application using the Symbian build system (SBS v2) that
is available for Symbian OS 9.5 based SDKs, enter the path to the SBS
v2 toolchain directory in \gui{SBS v2 directory}.
v2 tool chain directory in \gui{SBS v2 directory}.
\endlist
\section2 Compiling Projects With Linux
......@@ -3910,7 +3910,7 @@
\section1 Setting Up a Project
When you install the \QSDK, the build and run settings for the toolchains
When you install the \QSDK, the build and run settings for the tool chains
delivered with the \QSDK are set up automatically.
To view and modify the settings for currently open projects, switch to the
......@@ -4091,7 +4091,7 @@
\endlist
Qt Creator uses the compiler specified in the MADDE toolchain to
Qt Creator uses the compiler specified in the MADDE tool chain to
build the application.
Qt Creator generates an installation package, installs it on the device,
......@@ -7996,7 +7996,7 @@
workspaces that you can use in the compiler environment of your choice.
Since Qt Creator 1.1, CMake configuration files are supported.
Qt Creator 1.3 supports the Microsoft Toolchain if the CMake version
Qt Creator 1.3 supports the Microsoft tool chain if the CMake version
is at least 2.8.
\section1 Setting the Path for CMake
......
......@@ -352,7 +352,7 @@ void CMakeRunPage::initializePage()
if (m_cmakeWizard->existsUpToDateXmlFile()) {
m_descriptionLabel->setText(
tr("The directory %1 already contains a cbp file, which is recent enough. "
"You can pass special arguments or change the used toolchain here and rerun CMake. "
"You can pass special arguments or change the used tool chain here and rerun CMake. "
"Or simply finish the wizard directly.").arg(m_buildDirectory));
} else {
m_descriptionLabel->setText(
......
......@@ -313,7 +313,7 @@ void MakeStepConfigWidget::updateDetails()
param.setArguments(arguments);
m_summaryText = param.summary(displayName());
} else {
m_summaryText = tr("<b>Unknown Toolchain</b>");
m_summaryText = tr("<b>Unknown tool chain</b>");
}
emit updateSummary();
}
......
......@@ -52,7 +52,7 @@
<item row="2" column="0">
<widget class="QLabel" name="toolchainLabel">
<property name="text">
<string>&amp;Toolchain:</string>
<string>&amp;Tool chain:</string>
</property>
<property name="buddy">
<cstring>toolchainComboBox</cstring>
......
......@@ -44,7 +44,7 @@
<item row="1" column="0">
<widget class="QLabel" name="toolchainLabel">
<property name="text">
<string>&amp;Toolchain:</string>
<string>&amp;Tool chain:</string>
</property>
<property name="buddy">
<cstring>toolchainComboBox</cstring>
......
......@@ -2454,7 +2454,7 @@ QString DebuggerPluginPrivate::debuggerForAbi(const Abi &abi, DebuggerEngineType
{
enum { debug = 0 };
Abi searchAbi = abi;
// Pick the right toolchain in case cdb/gdb were started with other toolchains.
// Pick the right tool chain in case cdb/gdb were started with other tool chains.
// Also, lldb should be preferred over gdb.
if (searchAbi.os() == ProjectExplorer::Abi::WindowsOS) {
switch (et) {
......
......@@ -325,7 +325,7 @@ RunConfiguration *DebuggerRunControl::runConfiguration() const
////////////////////////////////////////////////////////////////////////
//
// Engine detection logic: Detection functions depending on toolchain, binary,
// Engine detection logic: Detection functions depending on tool chain, binary,
// etc. Return a list of possible engines (order of prefererence) without
// consideration of configuration, etc.
//
......
......@@ -43,7 +43,7 @@ class Abi;
namespace Debugger {
namespace Internal {
// Let the user pick a toolchain/ABI associated with a debugger.
// Let the user pick a tool chain/ABI associated with a debugger.
class DebuggerToolChainComboBox : public QComboBox
{
Q_OBJECT
......
......@@ -4313,7 +4313,7 @@ static QString gdbBinary(const DebuggerStartParameters &sp)
if (abiMatch)
return sp.debuggerCommand;
}
// 3) Find one from toolchains.
// 3) Find one from tool chains.
return debuggerCore()->debuggerForAbi(sp.toolChainAbi, GdbEngineType);
}
......
......@@ -87,7 +87,7 @@
<item row="3" column="0">
<widget class="QLabel" name="toolChainLabel">
<property name="text">
<string>&amp;ToolChain:</string>
<string>&amp;Tool chain:</string>
</property>
<property name="buddy">
<cstring>toolChainComboBox</cstring>
......
......@@ -516,7 +516,7 @@ void GenericBuildSettingsWidget::updateToolChainList()
QList<ToolChain *> tcs = ToolChainManager::instance()->toolChains();
if (!m_target->genericProject()->toolChain()) {
m_toolChainChooser->addItem(tr("<Invalid Toolchain>"), qVariantFromValue(static_cast<void *>(0)));
m_toolChainChooser->addItem(tr("<Invalid tool chain>"), qVariantFromValue(static_cast<void *>(0)));
m_toolChainChooser->setCurrentIndex(0);
}
foreach (ToolChain *tc, tcs) {
......
......@@ -84,7 +84,7 @@ public:
virtual QVariantMap toMap() const;
// Creates a suitable outputparser for custom build steps
// (based on the toolchain)
// (based on the tool chain)
// TODO this is not great API
// it's mainly so that custom build systems are better integrated
// with the generic project manager
......
......@@ -477,7 +477,7 @@ QList<ToolChain *> Internal::GccToolChainFactory::autoDetect()
return autoDetectToolchains(QLatin1String("g++"), debuggers, Abi::hostAbi());
}
// Used by the ToolChainManager to restore user-generated ToolChains
// Used by the ToolChainManager to restore user-generated tool chains
bool Internal::GccToolChainFactory::canRestore(const QVariantMap &data)
{
return idFromMap(data).startsWith(QLatin1String(Constants::GCC_TOOLCHAIN_ID) + QLatin1Char(':'));
......
......@@ -58,7 +58,7 @@ class GccToolChainFactory : public ToolChainFactory
Q_OBJECT
public:
// Name used to display the name of the toolchain that will be created.
// Name used to display the name of the tool chain that will be created.
QString displayName() const;
QString id() const;
......@@ -67,7 +67,7 @@ public:
bool canCreate();
ToolChain *create();
// Used by the ToolChainManager to restore user-generated ToolChains
// Used by the ToolChainManager to restore user-generated tool chains
bool canRestore(const QVariantMap &data);
ToolChain *restore(const QVariantMap &data);
......@@ -115,7 +115,7 @@ class MingwToolChainFactory : public GccToolChainFactory
Q_OBJECT
public:
// Name used to display the name of the toolchain that will be created.
// Name used to display the name of the tool chain that will be created.
QString displayName() const;
QString id() const;
......@@ -124,7 +124,7 @@ public:
bool canCreate();
ToolChain *create();
// Used by the ToolChainManager to restore user-generated ToolChains
// Used by the ToolChainManager to restore user-generated tool chains
bool canRestore(const QVariantMap &data);
ToolChain *restore(const QVariantMap &data);
......@@ -141,7 +141,7 @@ class LinuxIccToolChainFactory : public GccToolChainFactory
Q_OBJECT
public:
// Name used to display the name of the toolchain that will be created.
// Name used to display the name of the tool chain that will be created.
QString displayName() const;
QString id() const;
......@@ -149,7 +149,7 @@ public:
ToolChain *create();
// Used by the ToolChainManager to restore user-generated ToolChains
// Used by the ToolChainManager to restore user-generated tool chains
bool canRestore(const QVariantMap &data);
ToolChain *restore(const QVariantMap &data);
......
......@@ -77,7 +77,7 @@ public:
virtual bool isValid() const = 0;
/// Returns a list of target ids that this ToolChain is restricted to.
/// Returns a list of target ids that this tool chain is restricted to.
/// An empty list is shows that the toolchain is compatible with all targets.
virtual QStringList restrictedToTargets() const;
......@@ -96,7 +96,7 @@ public:
virtual bool canClone() const;
virtual ToolChain *clone() const = 0;
// Used by the toolchainmanager to save user-generated ToolChains.
// Used by the toolchainmanager to save user-generated tool chains.
// Make sure to call this method when deriving!
virtual QVariantMap toMap() const;
......@@ -127,7 +127,7 @@ class PROJECTEXPLORER_EXPORT ToolChainFactory : public QObject
Q_OBJECT
public:
// Name used to display the name of the toolchain that will be created.
// Name used to display the name of the tool chain that will be created.
virtual QString displayName() const = 0;
virtual QString id() const = 0;
......@@ -136,7 +136,7 @@ public:
virtual bool canCreate();
virtual ToolChain *create();
// Used by the ToolChainManager to restore user-generated ToolChains
// Used by the ToolChainManager to restore user-generated tool chains
virtual bool canRestore(const QVariantMap &data);
virtual ToolChain *restore(const QVariantMap &data);
......
......@@ -98,7 +98,7 @@ void ToolChainManager::restoreToolChains()
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
QList<ToolChainFactory *> factories = pm->getObjects<ToolChainFactory>();
// Autodetect ToolChains:
// Autodetect tool chains:
foreach (ToolChainFactory *f, factories) {
QList<ToolChain *> tcs = f->autoDetect();
foreach (ToolChain *tc, tcs)
......@@ -112,7 +112,7 @@ void ToolChainManager::restoreToolChains()
ToolChainManager::~ToolChainManager()
{
// Deregister toolchains
// Deregister tool chains
QList<ToolChain *> copy = m_d->m_toolChains;
foreach (ToolChain *tc, copy)
deregisterToolChain(tc);
......@@ -176,7 +176,7 @@ void ToolChainManager::restoreToolChains(const QString &fileName, bool autoDetec
}
}
if (!restored)
qWarning("Warning: Unable to restore manual toolchain '%s' stored in %s.",
qWarning("Warning: Unable to restore manual tool chain '%s' stored in %s.",
qPrintable(ToolChainFactory::idFromMap(tcMap)),
qPrintable(QDir::toNativeSeparators(fileName)));
}
......
......@@ -76,14 +76,14 @@ public slots:
signals:
void toolChainAdded(ProjectExplorer::ToolChain *);
// ToolChain is still valid when this call happens!
// Tool chain is still valid when this call happens!
void toolChainRemoved(ProjectExplorer::ToolChain *);
private:
explicit ToolChainManager(QObject *parent = 0);
// Make sure the this is only called after all
// ToolChain Factories are registered!
// Tool chain Factories are registered!
void restoreToolChains();
void restoreToolChains(const QString &fileName, bool autoDetected = false);
......
......@@ -74,7 +74,7 @@ public:
parent->childNodes.removeOne(this);
qDeleteAll(childNodes);
// Do not delete toolchain, we do not own it.
// Do not delete tool chain, we do not own it.
Q_ASSERT(childNodes.isEmpty());
}
......@@ -280,7 +280,7 @@ void ToolChainModel::setDirty(ToolChain *tc)
void ToolChainModel::apply()
{
// Remove unused ToolChains:
// Remove unused tool chains:
QList<ToolChainNode *> nodes = m_toRemoveList;
foreach (ToolChainNode *n, nodes) {
Q_ASSERT(!n->parent);
......@@ -288,7 +288,7 @@ void ToolChainModel::apply()
}
Q_ASSERT(m_toRemoveList.isEmpty());
// Update toolchains:
// Update tool chains:
foreach (ToolChainNode *n, m_manualRoot->childNodes) {
Q_ASSERT(n);
if (n->changed) {
......@@ -305,7 +305,7 @@ void ToolChainModel::apply()
}
}
// Add new (and already updated) toolchains
// Add new (and already updated) tool chains
nodes = m_toAddList;
foreach (ToolChainNode *n, nodes) {
ToolChainManager::instance()->registerToolChain(n->toolChain);
......@@ -442,7 +442,7 @@ QString ToolChainOptionsPage::id() const
QString ToolChainOptionsPage::displayName() const
{
return tr("Toolchains");
return tr("Tool chains");
}
QString ToolChainOptionsPage::category() const
......@@ -452,7 +452,7 @@ QString ToolChainOptionsPage::category() const
QString ToolChainOptionsPage::displayCategory() const
{
return tr("Toolchains");
return tr("Tool chains");
}
QIcon ToolChainOptionsPage::categoryIcon() const
......@@ -517,7 +517,7 @@ QWidget *ToolChainOptionsPage::createPage(QWidget *parent)
if (m_searchKeywords.isEmpty()) {
QLatin1Char sep(' ');
QTextStream stream(&m_searchKeywords);
stream << tr("Toolchains");
stream << tr("Tool chains");
foreach (ToolChainFactory *f, m_factories)
stream << sep << f->displayName();
......
......@@ -81,7 +81,7 @@ DebuggingHelperBuildTask::DebuggingHelperBuildTask(const QtVersion *version, Too
m_errorMessage =
QCoreApplication::translate(
"QtVersion",
"The Qt Version has no toolchain.");
"The Qt Version has no tool chain.");
return;
}
ProjectExplorer::ToolChain *tc = tcList.at(0);
......
......@@ -86,7 +86,7 @@ LibraryDetailsController::LibraryDetailsController(
// take active build configuration for it
Qt4BuildConfiguration *qt4BuildConfiguration =
qobject_cast<Qt4BuildConfiguration *>(project->activeTarget()->activeBuildConfiguration());
// if its toolchain is maemo behave the same as we would be on linux
// if its tool chain is maemo behave the same as we would be on linux
if (qt4BuildConfiguration
&& qt4BuildConfiguration->toolChain()
&& (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment