Commit 80d3f733 authored by Friedemann Kleint's avatar Friedemann Kleint

Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII.

Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 2776346d
......@@ -160,7 +160,7 @@ public:
~SimpleBuildStepConfigWidget() {}
QString summaryText() const { return QString("<b>%1</b>").arg(displayName()); }
QString summaryText() const { return QLatin1String("<b>") + displayName() + QLatin1String("</b>"); }
QString displayName() const { return m_step->displayName(); }
bool showWidget() const { return false; }
BuildStep *step() const { return m_step; }
......
......@@ -180,7 +180,7 @@ bool MakeStep::init()
Utils::QtcProcess::addArg(&args, makefile);
m_makeFileToCheck = QDir(workingDirectory).filePath(makefile);
} else {
m_makeFileToCheck = QDir(workingDirectory).filePath("Makefile");
m_makeFileToCheck = QDir(workingDirectory).filePath(QLatin1String("Makefile"));
}
} else {
if (!bc->makefile().isEmpty()) {
......@@ -188,7 +188,7 @@ bool MakeStep::init()
Utils::QtcProcess::addArg(&args, bc->makefile());
m_makeFileToCheck = QDir(workingDirectory).filePath(bc->makefile());
} else {
m_makeFileToCheck = QDir(workingDirectory).filePath("Makefile");
m_makeFileToCheck = QDir(workingDirectory).filePath(QLatin1String("Makefile"));
}
}
......@@ -215,7 +215,8 @@ bool MakeStep::init()
Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
if (toolChain->targetAbi().os() == ProjectExplorer::Abi::WindowsOS
&& toolChain->targetAbi().osFlavor() != ProjectExplorer::Abi::WindowsMSysFlavor) {
env.set("MAKEFLAGS", env.value("MAKEFLAGS").prepend("L"));
const QString makeFlags = QLatin1String("MAKEFLAGS");
env.set(makeFlags, QLatin1Char('L') + env.value(makeFlags));
}
}
......@@ -400,7 +401,8 @@ void MakeStepConfigWidget::updateDetails()
Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
if (toolChain->targetAbi().os() == ProjectExplorer::Abi::WindowsOS
&& toolChain->targetAbi().osFlavor() != ProjectExplorer::Abi::WindowsMSysFlavor) {
env.set("MAKEFLAGS", env.value("MAKEFLAGS").prepend("L"));
const QString makeFlags = QLatin1String("MAKEFLAGS");
env.set(makeFlags, QLatin1Char('L') + env.value(makeFlags));
}
}
param.setArguments(args);
......@@ -469,9 +471,9 @@ ProjectExplorer::BuildStep *MakeStepFactory::create(ProjectExplorer::BuildStepLi
if (!canCreate(parent, id))
return 0;
MakeStep *step = new MakeStep(parent);
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
if (parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)) {
step->setClean(true);
step->setUserArguments("clean");
step->setUserArguments(QLatin1String("clean"));
}
return step;
}
......
......@@ -61,18 +61,18 @@ void ProFileHighlighter::highlightBlock(const QString &text)
if (inCommentMode) {
setFormat(i, 1, m_formats[ProfileCommentFormat]);
} else {
if (c.isLetter() || c == '_' || c == '.' || c.isDigit()) {
if (c.isLetter() || c == QLatin1Char('_') || c == QLatin1Char('.') || c.isDigit()) {
buf += c;
setFormat(i - buf.length()+1, buf.length(), emptyFormat);
if (!buf.isEmpty() && ProFileKeywords::isFunction(buf))
setFormat(i - buf.length()+1, buf.length(), m_formats[ProfileFunctionFormat]);
else if (!buf.isEmpty() && ProFileKeywords::isVariable(buf))
setFormat(i - buf.length()+1, buf.length(), m_formats[ProfileVariableFormat]);
} else if (c == '(') {
} else if (c == QLatin1Char('(')) {
if (!buf.isEmpty() && ProFileKeywords::isFunction(buf))
setFormat(i - buf.length(), buf.length(), m_formats[ProfileFunctionFormat]);
buf.clear();
} else if (c == '#') {
} else if (c == QLatin1Char('#')) {
inCommentMode = true;
setFormat(i, 1, m_formats[ProfileCommentFormat]);
buf.clear();
......
......@@ -125,7 +125,7 @@ void ProFileHoverHandler::identifyQMakeKeyword(const QString &text, int pos)
if (i >= pos)
break; // we are after the tooltip pos
}
if (c == '#')
if (c == QLatin1Char('#'))
break; // comment start
}
}
......@@ -164,7 +164,7 @@ void ProFileHoverHandler::identifyDocFragment(ProFileHoverHandler::ManualKind ma
// Document fragment of qmake function is retrieved from docs.
// E.g. in case of the keyword "find" the document fragment
// parsed from docs is "find-variablename-substr".
m_docFragment = htmlExtractor.getQMakeFunctionId(html, m_docFragment);
m_docFragment = htmlExtractor.getQMakeFunctionId(QString::fromUtf8(html), m_docFragment);
}
}
......@@ -56,7 +56,7 @@ void QMakeParser::stdError(const QString &line)
description,
QString() /* filename */,
-1 /* linenumber */,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return;
}
if (lne.startsWith(QLatin1String("Project WARNING:"))) {
......@@ -65,23 +65,23 @@ void QMakeParser::stdError(const QString &line)
description,
QString() /* filename */,
-1 /* linenumber */,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return;
}
if (m_error.indexIn(lne) > -1) {
QString fileName = m_error.cap(1);
Task::TaskType type = Task::Error;
if (fileName.startsWith("WARNING: ")) {
if (fileName.startsWith(QLatin1String("WARNING: "))) {
type = Task::Warning;
fileName = fileName.mid(9);
} else if (fileName.startsWith("ERROR: ")) {
} else if (fileName.startsWith(QLatin1String("ERROR: "))) {
fileName = fileName.mid(7);
}
emit addTask(Task(type,
m_error.cap(3) /* description */,
fileName,
m_error.cap(2).toInt() /* line */,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return;
}
IOutputParser::stdError(line);
......@@ -102,6 +102,7 @@ using namespace ProjectExplorer;
void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
{
const QString categoryBuildSystem = QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
QTest::addColumn<QString>("input");
QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines");
......@@ -129,7 +130,7 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
<< Task(Task::Error,
QLatin1String("undefined file"),
QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))
categoryBuildSystem))
<< QString();
QTest::newRow("qMake Parse Error")
......@@ -141,7 +142,7 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
QLatin1String("Parse Error ('sth odd')"),
QLatin1String("e:\\project.pro"),
14,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))
categoryBuildSystem))
<< QString();
QTest::newRow("qMake warning")
......@@ -152,7 +153,7 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
<< Task(Task::Warning,
QLatin1String("bearer module might require ReadUserData capability"),
QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))
categoryBuildSystem))
<< QString();
QTest::newRow("qMake warning with location")
......@@ -163,7 +164,7 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
<< Task(Task::Warning,
QLatin1String("Unescaped backslashes are deprecated."),
QLatin1String("e:\\NokiaQtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl"), 1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))
categoryBuildSystem))
<< QString();
}
......
......@@ -135,7 +135,7 @@ QString QMakeStep::allArguments(bool shorted)
else
arguments << QDir::toNativeSeparators(project()->file()->fileName());
arguments << "-r";
arguments << QLatin1String("-r");
bool userProvidedMkspec = false;
for (Utils::QtcProcess::ConstArgIterator ait(m_userArgs); ait.next(); ) {
if (ait.value() == QLatin1String("-spec")) {
......@@ -147,7 +147,7 @@ QString QMakeStep::allArguments(bool shorted)
}
Utils::FileName specArg = mkspec();
if (!userProvidedMkspec && !specArg.isEmpty())
arguments << "-spec" << specArg.toUserOutput();
arguments << QLatin1String("-spec") << specArg.toUserOutput();
// Find out what flags we pass on to qmake
arguments << bc->configCommandLineArguments();
......@@ -243,13 +243,13 @@ bool QMakeStep::init()
if (!qt4bc->subNodeBuild()->makefile().isEmpty()) {
makefile.append(qt4bc->subNodeBuild()->makefile());
} else {
makefile.append("/Makefile");
makefile.append(QLatin1String("/Makefile"));
}
} else if (!qt4bc->makefile().isEmpty()) {
makefile.append("/");
makefile.append(QLatin1Char('/'));
makefile.append(qt4bc->makefile());
} else {
makefile.append("/Makefile");
makefile.append(QLatin1String("/Makefile"));
}
// Check whether we need to run qmake
......@@ -723,11 +723,12 @@ void QMakeStepConfigWidget::recompileMessageBoxFinished(int button)
return;
QList<ProjectExplorer::BuildStepList *> stepLists;
stepLists << bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
stepLists << bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
const QString clean = QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
const QString build = QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
stepLists << bc->stepList(clean) << bc->stepList(build);
ProjectExplorer::BuildManager *bm = ProjectExplorerPlugin::instance()->buildManager();
bm->buildLists(stepLists, QStringList() << ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
<< ProjectExplorerPlugin::displayNameForStepId(ProjectExplorer::Constants::BUILDSTEPS_BUILD));
bm->buildLists(stepLists, QStringList() << ProjectExplorerPlugin::displayNameForStepId(clean)
<< ProjectExplorerPlugin::displayNameForStepId(build));
}
}
......
......@@ -67,7 +67,7 @@ DesktopQtVersion *DesktopQtVersion::clone() const
QString DesktopQtVersion::type() const
{
return QtSupport::Constants::DESKTOPQT;
return QLatin1String(QtSupport::Constants::DESKTOPQT);
}
QString DesktopQtVersion::warningReason() const
......
......@@ -73,9 +73,9 @@ QStringList Qt4DesktopTargetFactory::supportedTargetIds(ProjectExplorer::Project
{
if (parent && !qobject_cast<Qt4Project *>(parent))
return QStringList();
if (!QtSupport::QtVersionManager::instance()->supportsTargetId(Constants::DESKTOP_TARGET_ID))
return QStringList();
return QStringList() << QLatin1String(Constants::DESKTOP_TARGET_ID);
const QString desktopId = QLatin1String(Constants::DESKTOP_TARGET_ID);
return QtSupport::QtVersionManager::instance()->supportsTargetId(desktopId) ?
QStringList(desktopId) : QStringList();
}
QString Qt4DesktopTargetFactory::displayNameForId(const QString &id) const
......@@ -164,11 +164,11 @@ ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Projec
QSet<QString> Qt4DesktopTargetFactory::targetFeatures(const QString & /*id*/) const
{
QSet<QString> features;
features << Constants::DESKTOP_TARGETFEATURE_ID;
features << Constants::SHADOWBUILD_TARGETFEATURE_ID;
features << QLatin1String(Constants::DESKTOP_TARGETFEATURE_ID)
<< QLatin1String(Constants::SHADOWBUILD_TARGETFEATURE_ID)
// how to check check whether they component set is really installed?
features << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
features << Constants::QTQUICKCOMPONENTS_MEEGO_TARGETFEATURE_ID;
<< QLatin1String(Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID)
<< QLatin1String(Constants::QTQUICKCOMPONENTS_MEEGO_TARGETFEATURE_ID);
return features;
}
......@@ -185,7 +185,7 @@ ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Projec
info.version, info.buildConfig,
info.additionalArguments, info.directory, info.importing);
t->addDeployConfiguration(t->createDeployConfiguration(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID));
t->addDeployConfiguration(t->createDeployConfiguration(QLatin1String(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
t->createApplicationProFiles();
......
......@@ -247,7 +247,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
m_useTerminalCheck = new QCheckBox(tr("Run in terminal"), this);
m_useTerminalCheck->setChecked(m_qt4RunConfiguration->runMode() == ProjectExplorer::LocalApplicationRunConfiguration::Console);
toplayout->addRow(QString(), m_useTerminalCheck);
m_useTerminalCheck->setVisible(qt4RunConfiguration->target()->id() != Constants::QT_SIMULATOR_TARGET_ID);
m_useTerminalCheck->setVisible(qt4RunConfiguration->target()->id() != QLatin1String(Constants::QT_SIMULATOR_TARGET_ID));
QLabel *debuggerLabel = new QLabel(tr("Debugger:"), this);
debuggerLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
......@@ -420,7 +420,7 @@ void Qt4RunConfigurationWidget::workingDirectoryReseted()
{
// This emits a signal connected to workingDirectoryChanged()
// that sets the m_workingDirectoryEdit
m_qt4RunConfiguration->setBaseWorkingDirectory("");
m_qt4RunConfiguration->setBaseWorkingDirectory(QString());
}
void Qt4RunConfigurationWidget::argumentsEdited(const QString &args)
......@@ -609,7 +609,7 @@ Utils::Environment Qt4RunConfiguration::baseEnvironment() const
env = target()->activeBuildConfiguration()->environment();
}
if (m_isUsingDyldImageSuffix) {
env.set("DYLD_IMAGE_SUFFIX", "_debug");
env.set(QLatin1String("DYLD_IMAGE_SUFFIX"), QLatin1String("_debug"));
}
// The user could be linking to a library found via a -L/some/dir switch
......@@ -800,7 +800,7 @@ QStringList Qt4RunConfigurationFactory::availableCreationIds(ProjectExplorer::Ta
Qt4BaseTarget *t = qobject_cast<Qt4BaseTarget *>(parent);
if (!t)
return QStringList();
if (t->id() != Constants::DESKTOP_TARGET_ID
if (t->id() != QLatin1String(Constants::DESKTOP_TARGET_ID)
&& t->id() != QLatin1String(Constants::QT_SIMULATOR_TARGET_ID))
return QStringList();
return t->qt4Project()->applicationProFilePathes(QLatin1String(QT4_RC_PREFIX));
......
......@@ -53,7 +53,7 @@ Qt4SimulatorTarget::Qt4SimulatorTarget(Qt4Project *parent, const QString &id) :
m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this))
{
setDisplayName(defaultDisplayName());
setIcon(QIcon(":/projectexplorer/images/SymbianEmulator.png"));
setIcon(QIcon(QLatin1String(":/projectexplorer/images/SymbianEmulator.png")));
}
Qt4SimulatorTarget::~Qt4SimulatorTarget()
......
......@@ -73,9 +73,9 @@ QStringList Qt4SimulatorTargetFactory::supportedTargetIds(ProjectExplorer::Proje
{
if (parent && !qobject_cast<Qt4Project *>(parent))
return QStringList();
if (!QtSupport::QtVersionManager::instance()->supportsTargetId(Constants::QT_SIMULATOR_TARGET_ID))
return QStringList();
return QStringList() << QLatin1String(Constants::QT_SIMULATOR_TARGET_ID);
const QString simulatorId = QLatin1String(Constants::QT_SIMULATOR_TARGET_ID);
return QtSupport::QtVersionManager::instance()->supportsTargetId(simulatorId) ?
QStringList(simulatorId) : QStringList();
}
QString Qt4SimulatorTargetFactory::displayNameForId(const QString &id) const
......@@ -88,7 +88,7 @@ QString Qt4SimulatorTargetFactory::displayNameForId(const QString &id) const
QIcon Qt4SimulatorTargetFactory::iconForId(const QString &id) const
{
if (id == QLatin1String(Constants::QT_SIMULATOR_TARGET_ID))
return QIcon(":/projectexplorer/images/SymbianEmulator.png");
return QIcon(QLatin1String(":/projectexplorer/images/SymbianEmulator.png"));
return QIcon();
}
......@@ -128,11 +128,11 @@ QSet<QString> Qt4SimulatorTargetFactory::targetFeatures(const QString & /*id*/)
{
QSet<QString> features;
features << Constants::MOBILE_TARGETFEATURE_ID;
features << Constants::SHADOWBUILD_TARGETFEATURE_ID;
features << QLatin1String(Constants::MOBILE_TARGETFEATURE_ID)
<< QLatin1String(Constants::SHADOWBUILD_TARGETFEATURE_ID)
// how to check check whether the component set is really installed?
features << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
features << Constants::QTQUICKCOMPONENTS_MEEGO_TARGETFEATURE_ID;
<< QLatin1String(Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID)
<< QLatin1String(Constants::QTQUICKCOMPONENTS_MEEGO_TARGETFEATURE_ID);
return features;
}
......@@ -166,7 +166,7 @@ ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Proj
t->addQt4BuildConfiguration(msgBuildConfigurationName(info), QString(), info.version, info.buildConfig,
info.additionalArguments, info.directory, info.importing);
t->addDeployConfiguration(t->createDeployConfiguration(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID));
t->addDeployConfiguration(t->createDeployConfiguration(QLatin1String(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
t->createApplicationProFiles();
......
......@@ -67,7 +67,7 @@ SimulatorQtVersion *SimulatorQtVersion::clone() const
QString SimulatorQtVersion::type() const
{
return QtSupport::Constants::SIMULATORQT;
return QLatin1String(QtSupport::Constants::SIMULATORQT);
}
QString SimulatorQtVersion::warningReason() const
......
......@@ -78,7 +78,7 @@ QtSupport::BaseQtVersion *SimulatorQtVersionFactory::create(const Utils::FileNam
QFileInfo fi = qmakePath.toFileInfo();
if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0;
QStringList configValues = evaluator->values("CONFIG");
QStringList configValues = evaluator->values(QLatin1String("CONFIG"));
if (!configValues.contains(QLatin1String("simulator")))
return 0;
......
......@@ -45,7 +45,7 @@ AbldParser::AbldParser() :
m_waitingForStdOutContinuation(false)
{
setObjectName(QLatin1String("AbldParser"));
m_perlIssue.setPattern("^(WARNING|ERROR):\\s([^\\(\\)]+[^\\d])\\((\\d+)\\) : (.+)$");
m_perlIssue.setPattern(QLatin1String("^(WARNING|ERROR):\\s([^\\(\\)]+[^\\d])\\((\\d+)\\) : (.+)$"));
m_perlIssue.setMinimal(true);
}
......@@ -60,7 +60,7 @@ void AbldParser::stdOutput(const QString &line)
lne /* description */,
QString() /* filename */,
-1 /* linenumber */,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
return;
}
if (lne.startsWith(QLatin1String("FATAL ERROR:")) ||
......@@ -69,7 +69,7 @@ void AbldParser::stdOutput(const QString &line)
lne /* description */,
QString() /* filename */,
-1 /* linenumber */,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
m_waitingForStdOutContinuation = false;
return;
}
......@@ -82,7 +82,7 @@ void AbldParser::stdOutput(const QString &line)
Task task(Task::Unknown,
m_perlIssue.cap(4) /* description */,
m_currentFile, m_currentLine,
TASK_CATEGORY_BUILDSYSTEM);
QLatin1String(TASK_CATEGORY_BUILDSYSTEM));
if (m_perlIssue.cap(1) == QLatin1String("WARNING"))
task.type = Task::Warning;
......@@ -97,7 +97,7 @@ void AbldParser::stdOutput(const QString &line)
m_waitingForStdOutContinuation = false;
emit addTask(Task(Task::Error,
line, QString(), -1,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
return;
}
......@@ -110,7 +110,7 @@ void AbldParser::stdOutput(const QString &line)
emit addTask(Task(Task::Unknown,
lne /* description */,
m_currentFile, m_currentLine,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
m_waitingForStdOutContinuation = true;
return;
}
......@@ -131,7 +131,7 @@ void AbldParser::stdError(const QString &line)
lne /* description */,
QString() /* filename */,
-1 /* linenumber */,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
return;
}
......@@ -140,7 +140,7 @@ void AbldParser::stdError(const QString &line)
lne /* description */,
QString() /* filename */,
-1 /* linenumber */,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
m_waitingForStdErrContinuation = false;
return;
}
......@@ -159,7 +159,7 @@ void AbldParser::stdError(const QString &line)
emit addTask(Task(Task::Warning, description,
m_currentFile,
-1 /* linenumber */,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
m_waitingForStdErrContinuation = true;
return;
}
......@@ -168,7 +168,7 @@ void AbldParser::stdError(const QString &line)
emit addTask(Task(Task::Error, description,
m_currentFile,
-1 /* linenumber */,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
m_waitingForStdErrContinuation = true;
return;
}
......@@ -178,7 +178,7 @@ void AbldParser::stdError(const QString &line)
lne /* description */,
m_currentFile,
-1 /* linenumber */,
TASK_CATEGORY_BUILDSYSTEM));
QLatin1String(TASK_CATEGORY_BUILDSYSTEM)));
m_waitingForStdErrContinuation = true;
return;
}
......
......@@ -111,7 +111,7 @@ bool CodaRunControl::isRunning() const
QIcon CodaRunControl::icon() const
{
return QIcon(ProjectExplorer::Constants::ICON_DEBUG_SMALL);
return QIcon(QLatin1String(ProjectExplorer::Constants::ICON_DEBUG_SMALL));
}
bool CodaRunControl::setupLauncher()
......@@ -346,7 +346,7 @@ void CodaRunControl::handleFindProcesses(const CodaCommandResult &result)
m_codaDevice->sendProcessStartCommand(CodaCallback(this, &CodaRunControl::handleCreateProcess),
executableName(),
executableUid(),
commandLineArguments().split(' '),
commandLineArguments().split(QLatin1Char(' ')),
QString(),
true);
appendMessage(tr("Launching: %1\n").arg(executableName()), Utils::NormalMessageFormat);
......@@ -362,7 +362,7 @@ void CodaRunControl::handleCreateProcess(const CodaCommandResult &result)
Json::JsonValue id = result.values.at(0).findChild("ID");
if (id.isValid()) {
m_state = StateProcessRunning;
m_runningProcessId = id.data();
m_runningProcessId = QLatin1String(id.data());
processCreated = true;
}
}
......
......@@ -73,7 +73,7 @@ static QString gcceVersion(const QString &command)
}
QString version = QString::fromLocal8Bit(gxx.readLine().trimmed());
if (version.contains(QRegExp("^\\d+\\.\\d+\\.\\d+.*$")))
if (version.contains(QRegExp(QLatin1String("^\\d+\\.\\d+\\.\\d+.*$"))))
return version;
return QString();
......
......@@ -84,9 +84,9 @@ QString Qt4SymbianTarget::defaultDisplayName(const QString &id)
QIcon Qt4SymbianTarget::iconForId(const QString &id)
{
if (id == QLatin1String(Constants::S60_EMULATOR_TARGET_ID))
return QIcon(":/projectexplorer/images/SymbianEmulator.png");
return QIcon(QLatin1String(":/projectexplorer/images/SymbianEmulator.png"));
if (id == QLatin1String(Constants::S60_DEVICE_TARGET_ID))
return QIcon(":/projectexplorer/images/SymbianDevice.png");
return QIcon(QLatin1String(":/projectexplorer/images/SymbianDevice.png"));
return QIcon();
}
......@@ -107,7 +107,7 @@ QList<ProjectExplorer::ToolChain *> Qt4SymbianTarget::possibleToolChains(Project
}
} else if (id() == QLatin1String(Constants::S60_DEVICE_TARGET_ID)) {
foreach (ProjectExplorer::ToolChain *tc, candidates) {
if (!tc->id().startsWith(Qt4ProjectManager::Constants::WINSCW_TOOLCHAIN_ID))
if (!tc->id().startsWith(QLatin1String(Qt4ProjectManager::Constants::WINSCW_TOOLCHAIN_ID)))
tmp.append(tc);
}
}
......
......@@ -81,10 +81,12 @@ QStringList Qt4SymbianTargetFactory::supportedTargetIds(ProjectExplorer::Project
QStringList ids;
// The QtVersionManager will just check whether theres
if (QtSupport::QtVersionManager::instance()->supportsTargetId(Constants::S60_DEVICE_TARGET_ID))
ids << QLatin1String(Constants::S60_DEVICE_TARGET_ID);
if (QtSupport::QtVersionManager::instance()->supportsTargetId(Constants::S60_EMULATOR_TARGET_ID))
ids << QLatin1String(Constants::S60_EMULATOR_TARGET_ID);
const QString deviceId = QLatin1String(Constants::S60_DEVICE_TARGET_ID);
if (QtSupport::QtVersionManager::instance()->supportsTargetId(deviceId))
ids << deviceId;
const QString emulatorId = QLatin1String(Constants::S60_EMULATOR_TARGET_ID);
if (QtSupport::QtVersionManager::instance()->supportsTargetId(emulatorId))
ids << emulatorId;
return ids;
}
......@@ -97,9 +99,9 @@ QString Qt4SymbianTargetFactory::displayNameForId(const QString &id) const