From 44dd2b6bdf22c61889cae586fa463a3f56b2664c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 2 Oct 2013 12:45:00 +0200
Subject: [PATCH] fix build against qt4
Change-Id: I1884f6e61dcae95817da10f0ead67f2df99b4ec7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/cpptools/cppmodelmanager_test.cpp | 2 +-
src/plugins/qnx/cascadesimport/projectfileconverter.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index bcc44889470..bf17c90cd3e 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -783,7 +783,7 @@ QString nameOfFirstDeclaration(const Document::Ptr &doc)
if (CPlusPlus::Declaration *decl = s->asDeclaration()) {
if (const CPlusPlus::Name *name = decl->name()) {
if (const CPlusPlus::Identifier *identifier = name->identifier())
- return QLatin1String(identifier->chars(), identifier->size());
+ return QString::fromLatin1(identifier->chars(), identifier->size());
}
}
}
diff --git a/src/plugins/qnx/cascadesimport/projectfileconverter.cpp b/src/plugins/qnx/cascadesimport/projectfileconverter.cpp
index 405d719079e..46a5e373fc5 100644
--- a/src/plugins/qnx/cascadesimport/projectfileconverter.cpp
+++ b/src/plugins/qnx/cascadesimport/projectfileconverter.cpp
@@ -102,7 +102,7 @@ static QString updateVariable(const QString &varStr, const QString &varsToAdd,
var.remove(s);
QStringList sl = QStringList::fromSet(var);
- return sl.join(QLatin1Char(' '));
+ return sl.join(QLatin1String(" "));
}
bool ProjectFileConverter::convertFile(Core::GeneratedFile &file, QString &errorMessage)
--
GitLab