aboutsummaryrefslogtreecommitdiffstats
path: root/qtwebview
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into devOswald Buddenhagen2015-09-181-0/+0
| | | | | | | | | Conflicts: .gitmodules qtquickcontrols2 qtwebview Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
* Add qtwebview as submoduleFrederik Gladhorn2015-09-031-0/+0
Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>