summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2016-03-17 15:27:06 +0200
committerBogDan Vatra <bogdan@kdab.com>2016-03-17 13:29:27 +0000
commit4325aa4b9c6939698d3be6f58955910e7c3268cb (patch)
tree6f6c2258fc7ed642bf7ff5e8a59714f7d125f949
parent792fb7c40e33fa34d6039956c48dea4bd82bb8d1 (diff)
Android: Fix compilation
Change-Id: Iba7c70d47460777f6a503c34736bce9a7e6b300b Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
-rw-r--r--tools/qgltf/qgltf.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp
index 9486070f8..4b640dd60 100644
--- a/tools/qgltf/qgltf.cpp
+++ b/tools/qgltf/qgltf.cpp
@@ -1924,6 +1924,12 @@ void GltfExporter::exportParameter(QJsonObject &dst, const QVector<ProgramInfo::
}
}
+struct ProgramNames
+{
+ QString name;
+ QString coreName;
+};
+
void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename)
{
if (!opts.shaders)
@@ -1981,11 +1987,6 @@ void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename)
obj["shaders"] = shaders;
QJsonObject programs;
- struct ProgramNames
- {
- QString name;
- QString coreName;
- };
QHash<ProgramInfo *, ProgramNames> programMap;
foreach (ProgramInfo *prog, m_usedPrograms) {