Enable QT_NO_CAST_FROM_BYTEARRAY

Silently casting QByteArray to char* is dangerous and it's hard to find
an error in the code. Thus, forbid implicit casting and fix code
accordingly.

Change-Id: I216f1b19768ad529ff050df0e81bfc4ad10b7c00
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/corelib/api/languageinfo.cpp b/src/lib/corelib/api/languageinfo.cpp
index cb023927a..505012e88 100644
--- a/src/lib/corelib/api/languageinfo.cpp
+++ b/src/lib/corelib/api/languageinfo.cpp
@@ -62,15 +62,15 @@ std::string LanguageInfo::qmlTypeInfo()
     auto typeNames = builtins.allTypeNames();
     typeNames.sort();
     for (const QString &typeName : qAsConst(typeNames)) {
-        QByteArray utf8TypeName = typeName.toUtf8();
+        const auto typeNameString = typeName.toStdString();
         result.append("    Component {\n");
-        result.append(QByteArray("        name: \"") + utf8TypeName + QByteArray("\"\n"));
+        result.append("        name: \"" + typeNameString + "\"\n");
         result.append("        exports: [ \"qbs/");
-        result.append(utf8TypeName);
+        result.append(typeNameString);
         result.append(" ");
         const auto v = builtins.languageVersion();
         result.append(QStringLiteral("%1.%2")
-                      .arg(v.majorVersion()).arg(v.minorVersion()).toUtf8());
+                      .arg(v.majorVersion()).arg(v.minorVersion()).toUtf8().data());
         result.append("\" ]\n");
         result.append("        prototype: \"QQuickItem\"\n");
 
@@ -83,7 +83,7 @@ std::string LanguageInfo::qmlTypeInfo()
         });
         for (const Internal::PropertyDeclaration &property : qAsConst(properties)) {
             result.append("        Property { name: \"");
-            result.append(property.name().toUtf8());
+            result.append(property.name().toUtf8().data());
             result.append("\"; ");
             switch (property.type()) {
             case qbs::Internal::PropertyDeclaration::UnknownType:
diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp
index 1918117d6..3bba06ada 100644
--- a/src/lib/corelib/tools/fileinfo.cpp
+++ b/src/lib/corelib/tools/fileinfo.cpp
@@ -355,7 +355,7 @@ QString applicationDirPath()
 
 FileInfo::FileInfo(const QString &fileName)
 {
-    if (stat(fileName.toLocal8Bit(), &m_stat) == -1) {
+    if (stat(fileName.toLocal8Bit().constData(), &m_stat) == -1) {
         m_stat.st_mtime = 0;
         m_stat.st_mode = 0;
     }