From cd3ca9e53693cb1815ff144ba68b42225c07de9f Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 6 Nov 2022 01:23:39 +0100 Subject: [PATCH] Do not use zstd compression for Qt6 as there is no built-in decompression --- src/klayout.pri | 5 +++++ src/tl/tl/tlStream.cc | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/klayout.pri b/src/klayout.pri index f70c810ba..0cb25c0ab 100644 --- a/src/klayout.pri +++ b/src/klayout.pri @@ -130,6 +130,11 @@ equals(HAVE_CRONOLOGY, "1") { INCLUDEPATH += $$CRONOLOGY_INCLUDE } +!lessThan(QT_MAJOR_VERSION, 6) { + # internal resource readers to not support zstd so far + QMAKE_RESOURCE_FLAGS += --compress-algo zlib +} + msvc { QMAKE_CXXFLAGS += \ diff --git a/src/tl/tl/tlStream.cc b/src/tl/tl/tlStream.cc index 2813a9114..7a9c78df3 100644 --- a/src/tl/tl/tlStream.cc +++ b/src/tl/tl/tlStream.cc @@ -212,9 +212,9 @@ InputStream::InputStream (const std::string &abstract_path) QByteArray data; #if QT_VERSION >= 0x60000 - if (res.compressionAlgorithm () == QResource::ZlibCompression) { + if (res.compressionAlgorithm () == QResource::ZlibCompression) { #else - if (res.isCompressed ()) { + if (res.isCompressed ()) { #endif data = qUncompress ((const unsigned char *)res.data (), (int)res.size ()); } else {