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

Remove BlackBerry terminology and code

Browse Source 
Remove a bunch of BlackBerry specific code blocks and functions.

Change most instances of NDK/SDK (the BlackBerry terms) to SDP (the QNX
term).  To maintain backward compatibility, some instances of NDK/SDK
that end up in external files have been left as is.

Change-Id: I8f589601542983323e41e7b2dd7822914d971623
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
James McDonnell
2016-12-13 14:43:24 -05:00
parent 5d213cc5da
commit 9fda4907f2
13 changed files with 91 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/qnx/qnxtoolchain.cpp
View File

@@ -39,7 +39,7 @@ using namespace Utils;
namespace Qnx {
namespace Internal {
static const char CompilernNdkPath[] = "Qnx.QnxToolChain.NDKPath";
static const char CompilerSdpPath[] = "Qnx.QnxToolChain.NDKPath";
static const QList<Abi> qccSupportedAbis()
{
@@ -87,7 +87,7 @@ void QnxToolChain::addToEnvironment(Environment &env) const
{
if (env.value(QLatin1String("QNX_HOST")).isEmpty()
|| env.value(QLatin1String("QNX_TARGET")).isEmpty())
setQnxEnvironment(env, QnxUtils::qnxEnvironment(m_ndkPath));
setQnxEnvironment(env, QnxUtils::qnxEnvironment(m_sdpPath));
GccToolChain::addToEnvironment(env);
}
@@ -105,7 +105,7 @@ FileNameList QnxToolChain::suggestedMkspecList() const
QVariantMap QnxToolChain::toMap() const
{
QVariantMap data = GccToolChain::toMap();
data.insert(QLatin1String(CompilernNdkPath), m_ndkPath);
data.insert(QLatin1String(CompilerSdpPath), m_sdpPath);
return data;
}
@@ -114,20 +114,20 @@ bool QnxToolChain::fromMap(const QVariantMap &data)
if (!GccToolChain::fromMap(data))
return false;
m_ndkPath = data.value(QLatin1String(CompilernNdkPath)).toString();
m_sdpPath = data.value(QLatin1String(CompilerSdpPath)).toString();
return true;
}
QString QnxToolChain::ndkPath() const
QString QnxToolChain::sdpPath() const
{
return m_ndkPath;
return m_sdpPath;
}
void QnxToolChain::setNdkPath(const QString &ndkPath)
void QnxToolChain::setSdpPath(const QString &sdpPath)
{
if (m_ndkPath == ndkPath)
if (m_sdpPath == sdpPath)
return;
m_ndkPath = ndkPath;
m_sdpPath = sdpPath;
toolChainUpdated();
}
@@ -212,7 +212,7 @@ ToolChain *QnxToolChainFactory::create(ToolChain::Language l)
QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
: ToolChainConfigWidget(tc)
, m_compilerCommand(new PathChooser)
, m_ndkPath(new PathChooser)
, m_sdpPath(new PathChooser)
, m_abiWidget(new AbiWidget)
{
m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand);
@@ -220,21 +220,21 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
m_compilerCommand->setFileName(tc->compilerCommand());
m_compilerCommand->setEnabled(!tc->isAutoDetected());
m_ndkPath->setExpectedKind(PathChooser::ExistingDirectory);
m_ndkPath->setHistoryCompleter(QLatin1String("Qnx.Ndk.History"));
m_ndkPath->setPath(tc->ndkPath());
m_ndkPath->setEnabled(!tc->isAutoDetected());
m_sdpPath->setExpectedKind(PathChooser::ExistingDirectory);
m_sdpPath->setHistoryCompleter(QLatin1String("Qnx.Sdp.History"));
m_sdpPath->setPath(tc->sdpPath());
m_sdpPath->setEnabled(!tc->isAutoDetected());
m_abiWidget->setAbis(qccSupportedAbis(), tc->targetAbi());
m_abiWidget->setEnabled(!tc->isAutoDetected());
m_mainLayout->addRow(tr("&Compiler path:"), m_compilerCommand);
//: SDP refers to 'Software Development Platform'.
m_mainLayout->addRow(tr("NDK/SDP path:"), m_ndkPath);
m_mainLayout->addRow(tr("SDP path:"), m_sdpPath);
m_mainLayout->addRow(tr("&ABI:"), m_abiWidget);
connect(m_compilerCommand, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty);
connect(m_ndkPath, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty);
connect(m_sdpPath, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty);
connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolChainConfigWidget::dirty);
}
@@ -248,7 +248,7 @@ void QnxToolChainConfigWidget::applyImpl()
QString displayName = tc->displayName();
tc->resetToolChain(m_compilerCommand->fileName());
tc->setDisplayName(displayName); // reset display name
tc->setNdkPath(m_ndkPath->fileName().toString());
tc->setSdpPath(m_sdpPath->fileName().toString());
tc->setTargetAbi(m_abiWidget->currentAbi());
}
@@ -258,7 +258,7 @@ void QnxToolChainConfigWidget::discardImpl()
bool blocked = blockSignals(true);
QnxToolChain *tc = static_cast<QnxToolChain *>(toolChain());
m_compilerCommand->setFileName(tc->compilerCommand());
m_ndkPath->setPath(tc->ndkPath());
m_sdpPath->setPath(tc->sdpPath());
m_abiWidget->setAbis(tc->supportedAbis(), tc->targetAbi());
if (!m_compilerCommand->path().isEmpty())
m_abiWidget->setEnabled(true);
@@ -270,7 +270,7 @@ bool QnxToolChainConfigWidget::isDirtyImpl() const
QnxToolChain *tc = static_cast<QnxToolChain *>(toolChain());
Q_ASSERT(tc);
return m_compilerCommand->fileName() != tc->compilerCommand()
|| m_ndkPath->path() != tc->ndkPath()
|| m_sdpPath->path() != tc->sdpPath()
|| m_abiWidget->currentAbi() != tc->targetAbi();
}