diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index 6232b13ef5f..ab9d11e8a4c 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -251,7 +251,7 @@ void Manager::onProjectListChanged()
 
 void Manager::onTaskStarted(const QString &type)
 {
-    if (type != CppTools::Constants::TASK_INDEX)
+    if (type != QLatin1String(CppTools::Constants::TASK_INDEX))
         return;
 
     // disable tree updates to speed up
@@ -260,7 +260,7 @@ void Manager::onTaskStarted(const QString &type)
 
 void Manager::onAllTasksFinished(const QString &type)
 {
-    if (type != CppTools::Constants::TASK_INDEX)
+    if (type != QLatin1String(CppTools::Constants::TASK_INDEX))
         return;
 
     // parsing is finished, enable tree updates
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp
index 4ffaddda3db..33ef4909c5c 100644
--- a/src/plugins/classview/classviewparser.cpp
+++ b/src/plugins/classview/classviewparser.cpp
@@ -320,7 +320,8 @@ void Parser::addSymbol(const ParserTreeItem::Ptr &item, const CPlusPlus::Symbol
         itemAdd = ParserTreeItem::Ptr(new ParserTreeItem());
 
     // locations are 1-based in Symbol, start with 0 for the editor
-    SymbolLocation location(symbol->fileName(), symbol->line(), symbol->column() - 1);
+    SymbolLocation location(QString::fromUtf8(symbol->fileName() , symbol->fileNameLength()),
+                            symbol->line(), symbol->column() - 1);
     itemAdd->addSymbolLocation(location);
 
     // prevent showing a content of the functions
diff --git a/src/plugins/classview/classviewparsertreeitem.cpp b/src/plugins/classview/classviewparsertreeitem.cpp
index 95bf094b784..9182a730ef3 100644
--- a/src/plugins/classview/classviewparsertreeitem.cpp
+++ b/src/plugins/classview/classviewparsertreeitem.cpp
@@ -364,7 +364,7 @@ void ParserTreeItem::debugDump(int ident) const
             d->symbolInformations.constEnd();
     while(curHash != endHash) {
         const SymbolInformation &inf = curHash.key();
-        qDebug() << QString(2*ident, QChar(' ')) << inf.iconType() << inf.name() << inf.type()
+        qDebug() << QString(2*ident, QLatin1Char(' ')) << inf.iconType() << inf.name() << inf.type()
                 << curHash.value().isNull();
         if (!curHash.value().isNull())
             curHash.value()->debugDump(ident + 1);