Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
authorJani Heikkinen <jani.heikkinen@theqtcompany.com>
Mon, 10 Nov 2014 15:06:02 +0000 (16:06 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 10 Nov 2014 15:06:02 +0000 (16:06 +0100)
commit66a36359a7bf3da844c98b88cbcfddeb2b6c343f
treecbb14ae219cb876a0f812d14744f09c6d305e66e
parentb5fb59fc5fa8d180daa1cb95f12238657a53bbc2
parentfa520d0c86b69d4ff794df51ff498956a477127c
Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0