Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:01:28 +0000 (18:01 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:01:28 +0000 (18:01 +0100)
commit63611cff8719255261127a408cdd2f6b009221d0
treee111d3fc9614458e1161728857a49dcf30fe8bc1
parent70c70aef7ee35009bb00614fdd6d4d282f9c4e57
parent313a74cc4a9a5d200b2059d3d8767fe1a274c50d
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I0cd3b1b33e6d9bec729d941b06aeeb3d21851820
src/corelib/kernel/qobject.cpp
tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp