提交 75974654 编写于 作者: L Levi Armstrong 提交者: GitHub

Update to Qt Creator 4.2 (#78)

上级 30023beb
......@@ -111,7 +111,7 @@ bool ROSCatkinMakeStep::init(QList<const BuildStep *> &earlierSteps)
if (!bc)
emit addTask(Task::buildConfigurationMissingTask());
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ToolChain::Language::Cxx);
if (!tc)
emit addTask(Task::compilerMissingTask());
......
......@@ -120,7 +120,7 @@ bool ROSCatkinToolsStep::init(QList<const BuildStep *> &earlierSteps)
if (!bc)
emit addTask(Task::buildConfigurationMissingTask());
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ToolChain::Language::Cxx);
if (!tc)
emit addTask(Task::compilerMissingTask());
......
......@@ -194,8 +194,7 @@ void ROSProject::refresh()
void ROSProject::refreshCppCodeModel()
{
ToolChain *toolChain = ToolChainKitInformation::toolChain(activeTarget()->kit());
// For version 4.2 ToolChain *toolChain = ToolChainKitInformation::toolChain(activeTarget()->kit(), ToolChain::Language::Cxx);
ToolChain *toolChain = ToolChainKitInformation::toolChain(activeTarget()->kit(), ToolChain::Language::Cxx);
const Utils::FileName sysRoot = SysRootKitInformation::sysRoot(activeTarget()->kit());
// TODO: Need to run this in its own thread
......
......@@ -45,6 +45,7 @@
#include <utils/winutils.h>
#include <qmljstools/qmljstoolsconstants.h>
#include <utils/detailswidget.h>
#include <utils/utilsicons.h>
#include <QLineEdit>
#include <QComboBox>
......@@ -327,7 +328,7 @@ ROSRunControl::ROSRunControl(RunConfiguration *rc, Id id):
RunControl(rc, id),
d(new ROSRunControlPrivate)
{
setIcon(Core::Icons::RUN_SMALL);
setIcon(Utils::Icons::RUN_SMALL);
m_rc = qobject_cast<ROSRunConfiguration *>(rc);
d->running = false;
......
......@@ -34,6 +34,8 @@
#include <coreplugin/coreicons.h>
#include <coreplugin/icore.h>
#include <utils/utilsicons.h>
#include <aggregation/aggregate.h>
#include <cstring>
......@@ -62,13 +64,13 @@ ROSTerminalPane::ROSTerminalPane() :
m_tabWidget->setTabsClosable(true);
m_stopButton->setToolTip(tr("Kill active terminal's child process"));
m_stopButton->setIcon(Core::Icons::STOP_SMALL.icon());
m_stopButton->setIcon(Utils::Icons::STOP_SMALL.icon());
m_zoomInButton->setToolTip(tr("Increase Font Size"));
m_zoomInButton->setIcon(Core::Icons::PLUS.icon());
m_zoomInButton->setIcon(Utils::Icons::PLUS.icon());
m_zoomOutButton->setToolTip(tr("Decrease Font Size"));
m_zoomOutButton->setIcon(Core::Icons::MINUS.icon());
m_zoomOutButton->setIcon(Utils::Icons::MINUS.icon());
m_newTerminalButton->setToolTip(tr("Add new terminal"));
m_newTerminalButton->setIcon(Core::Icons::NEWFILE.icon());
m_newTerminalButton->setIcon(Utils::Icons::NEWFILE.icon());
updateToolBarButtonsEnabled();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册