delta/qt5/qtwebkit-examples.git - code.qt.io: qt/qtwebkit-examples.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1	Frederik Gladhorn	2015-03-17	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/webkitwidgets/browser/data/defaultbookmarks.xbel examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp Change-Id: I5b868d5eb612779b70f8bed123ef85c92caeeb06
\| *	Update links from qt-project.org to qt.iov5.4.2 5.4.2	Sergio Ahumada	2015-03-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- remove http://qt.digia.com since it now points to qt.io - move webkit.org down to match other repos Change-Id: I036b3ed84bdd8023fd32b7e9ccfde787ce666939 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* \|	Update copyright headers	Jani Heikkinen	2015-02-12	21	-149/+149
\|/ \| \| \| \| \| \| \| \|	Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ie12af52d2377d9e9e6f771f676fb286017921c6f Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
*	Update license headers and add new licenses	Jani Heikkinen	2014-08-24	21	-399/+231
\| \| \| \| \| \| \|	- Added LICENSE.LGPL21, LICENSE.LGPLv3 & LICENSE.GPLv2 Change-Id: If7c5fa43341211def780bcb77f922b54ddfafb45 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
*	Update copyright year in Digia's license headers	Sergio Ahumada	2013-01-07	21	-21/+21
\| \| \| \| \| \|	Change-Id: I08bbc366f34784f5dbc0fa38d7cef33189edd1cf Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
*	Adjust webkit example project install targets.	hjk	2012-12-10	30	-0/+2247
	This follows suit with aeb036e in qtbase. Change-Id: Ifc85b327df81d15f3579b911e07c95a3b7a3bb9d Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>