diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-22 03:03:05 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-22 03:03:05 +0200 |
commit | 68c61e39f6522efa89593303f96f5805971fcbf7 (patch) | |
tree | 9c4e5a777dbc8eff930380de812fbe00d445e65b /tools | |
parent | 84bb562bfc1168121774d3c4b073e3e05b6efcde (diff) | |
parent | 7e48ed01a3e70fae7dfaf599fd9b4300df537ecd (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 9 | ||||
-rw-r--r-- | tools/qscxmlc/templates.qrc | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index 40ae1dd..89a403b 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -108,13 +108,10 @@ static void genTemplate(QTextStream &out, const QString &filename, const Replace if (!file.isValid()) { qFatal("Unable to open template '%s'", qPrintable(filename)); } + Q_ASSERT(file.compressionAlgorithm() == QResource::NoCompression); QByteArray data; - if (file.isCompressed() && file.size()) { - data = qUncompress(file.data(), int(file.size())); - } else { - data = QByteArray::fromRawData(reinterpret_cast<const char *>(file.data()), - int(file.size())); - } + data = QByteArray::fromRawData(reinterpret_cast<const char *>(file.data()), + int(file.size())); const QString t = QString::fromLatin1(data); data.clear(); diff --git a/tools/qscxmlc/templates.qrc b/tools/qscxmlc/templates.qrc index 6f2ccf6..a00f24e 100644 --- a/tools/qscxmlc/templates.qrc +++ b/tools/qscxmlc/templates.qrc @@ -1,7 +1,7 @@ <RCC> <qresource prefix="/"> - <file>data.t</file> - <file>decl.t</file> - <file>cppdatamodel.t</file> + <file compression-algorithm="none">data.t</file> + <file compression-algorithm="none">decl.t</file> + <file compression-algorithm="none">cppdatamodel.t</file> </qresource> </RCC> |