Merge branch '5.6' into 5.7

Conflicts:
	examples/qt3d/examples-common/qorbitcontrol.h
	src/core/qnodecreatedchange.cpp
	src/core/qnodecreatedchange.h
	src/input/frontend/qaxisactionhandler.h
	src/input/frontend/qinputaspect.h
	src/input/frontend/qkeyboardhandler.h
	src/input/frontend/qmousedevice.h
	src/input/frontend/qmousehandler.h
	src/input/frontend/qphysicaldevicecreatedchange.h
	src/input/input.pro
	src/logic/qframeaction.h
	src/plugins/sceneparsers/assimp/assimp.pro
	src/quick3d/imports/input/importsinput.pro
	src/quick3d/imports/render/importsrender.pro
	src/render/backend/trianglesextractor.cpp
	src/render/framegraph/qclearbuffer.h
	src/render/framegraph/qlighting.h
	src/render/framegraph/qstateset.h
	src/render/frontend/qrenderattachment.h
	src/render/geometry/qabstractattribute.h
	src/render/geometry/qabstractbuffer.h
	src/render/geometry/qattribute.h
	src/render/geometry/qboundingvolumespecifier.h
	src/render/geometry/qbuffer.h
	src/render/materialsystem/qfilterkey.h
	src/render/materialsystem/qparameter.h
	src/render/materialsystem/qparametermapping.h
	src/render/renderstates/qblendstate.h
	src/render/renderstates/qdepthmask.h
	src/render/renderstates/qpointsize.cpp
	src/render/renderstates/qrenderstatecreatedchange.cpp
	src/render/renderstates/qstencilop.h
	src/render/renderstates/qstencilopseparate.h
	src/render/renderstates/qstenciltestseparate.h
	src/render/texture/qabstracttexture.h
	src/render/texture/qabstracttextureimage.h
	src/render/texture/qtextureproviders.h

Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4

1 files changed, 8 insertions, 6 deletions

diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp
index 81fef6eea..56ef71d7d 100644
--- a/tools/qgltf/qgltf.cpp
+++ b/tools/qgltf/qgltf.cpp
@@ -1916,6 +1916,14 @@ void GltfExporter::exportParameter(QJsonObject &dst, const QVector<ProgramInfo::
     }
 }
 
+namespace {
+struct ProgramNames
+{
+    QString name;
+    QString coreName;
+};
+}
+
 void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename)
 {
     if (!opts.shaders)
@@ -1973,12 +1981,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) {
         QJsonObject program;