From acde192b771f1baa2f01cac30c18ac9ce7054b28 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 31 Mar 2017 11:43:51 +0200 Subject: Don't explicitly disable the Qt3D category logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Category logging is off by default, so explicitly turning it off will just make it harder to turn it on in the application. qt.*.debug has special behavior in the sense that defaults to off. Other categories, like Qt3D.*.debug default to true. Therefore the only correct way in Qt 3D is to always specify warning-and-up as the default enabled severity. Change-Id: I91daf48e049b7a9fcfac9720982138b178ee4804 Reviewed-by: Antti Määttä --- src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/sceneparsers/gltfexport/gltfexporter.cpp') diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp index 7332fa6b5..49af741f9 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp @@ -225,7 +225,7 @@ using namespace Qt3DExtras; namespace Qt3DRender { -Q_LOGGING_CATEGORY(GLTFExporterLog, "Qt3D.GLTFExport") +Q_LOGGING_CATEGORY(GLTFExporterLog, "Qt3D.GLTFExport", QtWarningMsg) const QString MATERIAL_DIFFUSE_COLOR = QStringLiteral("kd"); const QString MATERIAL_SPECULAR_COLOR = QStringLiteral("ks"); -- cgit v1.2.3 From 14102df2e3e687f4db5f2d52d6c6308cfb4f9962 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 1 Apr 2017 23:24:12 -0700 Subject: Disable two functions not currently in use Found by Clang gltfexporter.cpp:171:19: error: unused function 'matrix2jsvec' [-Werror,-Wunused-function] Change-Id: I27b55fdf514247549455fffd14b18083413d36f9 Reviewed-by: Sean Harmer --- src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/plugins/sceneparsers/gltfexport/gltfexporter.cpp') diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp index 49af741f9..b2fd9ce5b 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp @@ -168,6 +168,7 @@ inline QJsonArray vec2jsvec(const QVector4D &v) return arr; } +#if 0 // unused for now inline QJsonArray matrix2jsvec(const QMatrix2x2 &matrix) { QJsonArray jm; @@ -185,6 +186,7 @@ inline QJsonArray matrix2jsvec(const QMatrix3x3 &matrix) jm.append(*mtxp++); return jm; } +#endif inline QJsonArray matrix2jsvec(const QMatrix4x4 &matrix) { -- cgit v1.2.3