Fix translations in states causing failing assertions
authorSimon Hausmann <simon.hausmann@digia.com>
Sat, 26 Apr 2014 12:42:39 +0000 (14:42 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 28 Apr 2014 10:50:17 +0000 (12:50 +0200)
commit68a662a2e15b790080ea12c2434f6e1fe60bda1b
tree2ac79cccf047e4ed5f61f06f9a3823715975daa1
parentda4f5504822189a7efd279d2380e0737f9de3968
Fix translations in states causing failing assertions

This is a smaller fix suitable for the release branch, merely adding support
for translations to the bytearray compilation step for states and ensuring a
consistent error message when qsTr is used in list models.

The proper fix will be done in dev that eliminates the entire intermediate
QByteArray storage for custom compilers.

Task-number: QTBUG-38492
Change-Id: If5171f16eb742c718e48b8bbcb265b0c241cd5e7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/qml/types/qqmllistmodel.cpp
src/quick/util/qquickpropertychanges.cpp
tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp
tests/auto/quick/qquickstates/data/QTBUG-38492.qml [new file with mode: 0644]
tests/auto/quick/qquickstates/tst_qquickstates.cpp