summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2020-05-02 19:05:20 -0700
committerThiago Macieira <thiago.macieira@intel.com>2020-05-20 19:56:17 -0700
commit12b13763883d649fe32893a123ec69dca62056df (patch)
tree8b67fd7cac63298f47859ac350c1d8d02d978864 /tools
parente620bcded0e98772983252f0dddf8199f1b46357 (diff)
Suppress the warning about binary JSON being deprecated
There's an upgrade plan somewhere, because binary JSON won't exist in Qt 5. Someone is taking care of that, surely. Change-Id: I99ab0f318b1c43b89888fffd160b626e8b871766 Reviewed-by: Simon Hausmann <hausmann@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qgltf/qgltf.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp
index 6e1761a33..98b2915d8 100644
--- a/tools/qgltf/qgltf.cpp
+++ b/tools/qgltf/qgltf.cpp
@@ -2460,9 +2460,12 @@ void GltfExporter::save(const QString &inputFilename)
const QIODevice::OpenMode openMode = opts.genBin
? (QIODevice::WriteOnly | QIODevice::Truncate)
: (QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
const QByteArray json = opts.genBin
? m_doc.toBinaryData()
: m_doc.toJson(opts.compact ? QJsonDocument::Compact : QJsonDocument::Indented);
+QT_WARNING_POP
#else
if (opts.showLog)
qDebug().noquote() << "Writing" << gltfName;