summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/qscxmlc/scxmlcppdumper.cpp9
-rw-r--r--tools/qscxmlc/templates.qrc6
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>