summaryrefslogtreecommitdiff
path: root/examples/webkitwidgets/browser/data
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Frederik Gladhorn2015-03-171-9/+6
|\ | | | | | | | | | | | | | | 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.25.4.2Sergio Ahumada2015-03-061-9/+6
| | | | | | | | | | | | | | | | - 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>
| * Adjust wiki links to the new redirectSergio Ahumada2015-03-031-1/+1
| | | | | | | | | | | | | | it looks nicer this way Change-Id: I689ec3945bca341c86713c03fa91eb877dbae5e5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-03-021-1/+1
| | | | | | | | | | Change-Id: Ia6984a4382c4c32e9e28a696dfc85bd59d831140 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Update copyright headersJani Heikkinen2015-02-122-4/+4
|/ | | | | | | | | 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>
* Fix up tabbed browser example.Michael Brüning2014-04-141-3/+3
| | | | | | | | | | | * Replaces deprecated Q_WS_MAC preprocessor defines. * Adds a command line parser. * Adds Digia Qt home page to the default bookmarks. * Removes dead Q_WS_QWS flagged code. Task-number: QTBUG-38069 Change-Id: If4ef67434c76c2ea096fa1250a9ffaa0e53e47dd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-071-1/+1
| | | | | | 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.hjk2012-12-108-0/+465
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>
View Lorry Controller Status