Merge 82654,82655 from ^/trunk

------------------------------------------------------------------------
  r82654 | jhunold | 2013-01-28 09:54:26 +0100 (Mo, 28 Jan 2013) | 3 lines
  
  Add support for QtWebkitWidgets. Fixes #7920
  
  Thanks to Frank Richter for the patch.
  ------------------------------------------------------------------------
  r82655 | jhunold | 2013-01-28 09:54:39 +0100 (Mo, 28 Jan 2013) | 1 line
  
  Fix QtTest test
  ------------------------------------------------------------------------


[SVN r82847]
This commit is contained in:
Jürgen Hunold 2013-02-13 06:59:58 +00:00
parent 0b7981555c
commit 3e2f608746

@ -1 +1 @@
Subproject commit 374bd44c048d65c43642fe0a61b8e7a2d03f9365
Subproject commit 0b0a10b7538d5ff39b735fd46fac2e5e509cddf2