From 25b1c54aac84564a3e5f47c1afc1aab25baebf45 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 29 Oct 2019 09:33:04 +0100 Subject: Don't try to load binary json GLTF data if !QT_CONFIG(binaryjson) Change-Id: Ic42a59c1dfea50ba152922bf4edbddc64b2d0f73 Reviewed-by: Simon Hausmann --- src/core/resources/qloadgltf_p.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/resources/qloadgltf_p.h b/src/core/resources/qloadgltf_p.h index 39601400a..be7ee0d5f 100644 --- a/src/core/resources/qloadgltf_p.h +++ b/src/core/resources/qloadgltf_p.h @@ -60,11 +60,13 @@ inline QJsonDocument qLoadGLTF(const QByteArray &gltfData) { +#if QT_CONFIG(binaryjson) { QJsonDocument sceneDocument = QJsonDocument::fromBinaryData(gltfData); if (!sceneDocument.isNull()) return sceneDocument; } +#endif { const QCborValue cbor = QCborValue::fromCbor(gltfData); if (cbor.isMap()) -- cgit v1.2.3