aboutsummaryrefslogtreecommitdiffstats
path: root/qtdeclarative.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-04-12 09:55:37 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-04-12 11:52:49 +0000
commit8ca22ca7eb5216513410651411fd2e0f07e50f34 (patch)
treec05967fe2204ef209fbaabe48c98cb36c7d6dd53 /qtdeclarative.pro
parent826b628f79e231762df6ad95195e35e51e934966 (diff)
Fix invocations of methods taking a QByteArray
Since commit 3b7e2a69f7eb8597c807de39b4de39721e9e2bd2 when calling a slot that takes a QByteArray with a parameter that is not a QByteArray, we would end up passing an empty QByteArray. This is a regression as previously we supported the conversion code path, i.e. when passing a QString it would be converted to utf-8, through QVariant's conversion code path. This code path needs to be re-activated by removing this "shortcut". The shortcut is not necessary as the execution engine's toVariant() function also knows how to apply the conversion. Change-Id: I0600d195c94fa4e1e0b7ab807f045f0da42f595b Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'qtdeclarative.pro')
0 files changed, 0 insertions, 0 deletions