diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-24 13:13:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-01-24 13:45:19 +0100 |
| commit | 8be22a883cc9af0c7198fd298a790c7630290d39 (patch) | |
| tree | becc2e2bfefd74bd53766c28e3a8656740ddb84a /tools/qscxmlc/scxmlcppdumper.cpp | |
| parent | 1c4d2c96f53765774c848d1aa4f495268da5c736 (diff) | |
Fix compilation after string data changes in qtbase
Adjust the moc copied code to generate the same byte arrays for string
literals and simplified the unicode string tables to just store offsets
and size so that we can use QString::fromRawData (just like in
qtdeclarative).
Change-Id: Id19c165454451192e0764b5d889a1275e92417ac
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tools/qscxmlc/scxmlcppdumper.cpp')
| -rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index 1aca09e..fa6359e 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -267,8 +267,8 @@ void generateTables(const GeneratedTableData &td, Replacements &replacements) return QString(); const int length = strings.at(idx).size(); - const QString str = QStringLiteral("STR_LIT(%1, %2, %3)").arg( - QString::number(idx), QString::number(ucharCount), QString::number(length)); + const QString str = QStringLiteral("%1, %2").arg( + QString::number(ucharCount), QString::number(length)); ucharCount += length + 1; return str; }); |