summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-09-12 17:12:06 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-09-27 08:49:05 +0000
commit3048a8ca2b3ff8b41ae789bbe154bf5558fd5421 (patch)
treedd761bf3c90728ebd6cf898ad956313955c0faf5 /tools
parent99fbb32e60e57a91ef7616fa16d361d58d9232f5 (diff)
qgltf: replace some QStringLiteral with QLatin1String
The first two lines are implicated in a compile error in a follow-up commit that introduces C++11 ranged for loops, so take another shot in the dark and remove the lambda expression embedded in the QStringLiteral macro by using QLatin1String instead, which, this being in a QStringBuilder expression, is even a desirable change in itself. Change-Id: I1ccd8d2e3c23cefdd50e7bc71f3f95dbeac78b72 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qgltf/qgltf.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp
index b57ea8df2..94cb32ed5 100644
--- a/tools/qgltf/qgltf.cpp
+++ b/tools/qgltf/qgltf.cpp
@@ -2014,13 +2014,13 @@ void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename)
programMap[prog].name = programName;
programs[programMap[prog].name] = program;
if (opts.genCore) {
- program["vertexShader"] = shaderMap[QString(prog->vertShader + QStringLiteral("_core"))];
- program["fragmentShader"] = shaderMap[QString(prog->fragShader + QStringLiteral("_core"))];
+ program["vertexShader"] = shaderMap[QString(prog->vertShader + QLatin1String("_core"))];
+ program["fragmentShader"] = shaderMap[QString(prog->fragShader + QLatin1String("_core"))];
QJsonArray attrs;
foreach (const ProgramInfo::Param &param, prog->attributes)
attrs << param.nameInShader;
program["attributes"] = attrs;
- programMap[prog].coreName = programName + QStringLiteral("_core");
+ programMap[prog].coreName = programName + QLatin1String("_core");
programs[programMap[prog].coreName] = program;
}
}