summaryrefslogtreecommitdiffstats
path: root/examples/webkit
Commit message (Expand)AuthorAgeFilesLines
* Fix permission (no execute bit).Frederik Gladhorn2011-11-22190-0/+0
* Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-063-2/+11
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-181-2/+2
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-2/+2
| |\
| | * Fix fancybrowser.proShane Kearns2011-08-041-1/+1
* | | examples: fix compilation with namespaced Qt.hjk2011-08-157-3/+11
|/ /
* | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-2259-12/+2651
|\ \
| * | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-2827-12/+484
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-18270-0/+9021
| |\ \
| * | | Added missing resource files.David Boddie2011-04-142-0/+12
| * | | Added missing data files. Renamed resource files.David Boddie2011-04-138-14/+115
| * | | Fixed whitespace in examples.David Boddie2011-03-255-5/+5
| * | | Doc: Added QtWebKit examples from Qt Quarterly 26 and 32.David Boddie2011-03-1029-1/+2055
* | | | Fix build of Fancy Browser demo.Alexis Menard2011-06-021-0/+1
| |/ / |/| |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-07270-1/+9020
|\ \ \ | | |/ | |/|
| * | Added QtWebKit Guide JavaScript files.Jerome Pasion2011-03-2214-0/+897
| * | Adding QtWebKit Guide example images and created links to images.Jerome Pasion2011-03-22178-27/+26
| * | Fixed style issue and replaced image.Jerome Pasion2011-03-221-1/+1
| * | Adding QtWebKit Guide CSS files.Jerome Pasion2011-03-2241-0/+4271
| * | Edited QtWebKit Guide.Jerome Pasion2011-03-211-0/+258
| * | Removed compile instruction for the webkit-guide code.Jerome Pasion2011-03-181-1/+0
| * | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-171-1/+2
| * | Fixed style issues with QtWebKit guide and examples.Jerome Pasion2011-03-151-7/+7
| * | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-1539-0/+3594
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-0/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Doc: Fixed example project file for Symbian.David Boddie2011-02-151-0/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1730-30/+30
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-1030-30/+30
| * Examples: Fix compilation with namespace.Christian Kandeler2011-01-072-4/+4
| * Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
* | compile fix for namespaced Qthjk2010-11-082-1/+5
* | Fixed spelling.Rohan McGovern2010-10-251-1/+1
|/
* Added missing QtWebKit example files and some whitespace fixes.Jerome Pasion2010-10-095-47/+198
* Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-0414-0/+551
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1925-689/+664
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-042-2/+2
|\
| * Fixed compile of framecapture, simpleselector for symbian-abld winscw.Rohan McGovern2010-02-022-2/+2
* | Merge branch '4.6'Thiago Macieira2010-01-1327-44/+56
|\ \ | |/
| * Modifies the google chat example to use the DOM APIPierre Rossi2010-01-123-18/+29
| * Added the 'framecapture' WebKit example to the default build.Andre Pedralho2010-01-111-1/+2
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0925-25/+25
| |\
| | * Update copyright year to 2010Jason McDonald2010-01-0625-25/+25
* | | Merge branch '4.6'Thiago Macieira2010-01-124-2/+18
|\ \ \ | |/ /
| * | Added UIDs and icons to some webkit examplesMiikka Heikkinen2010-01-074-2/+18
| |/
* | Merge branch '4.6'Thiago Macieira2009-12-262-4/+4
|\ \ | |/
| * Change some examples of Webkit to create the mainwindow on the stackBenjamin Poulain2009-12-143-6/+6
* | Fix memory leakDavid Faure2009-12-071-0/+1
* | Merge branch '4.6'Thiago Macieira2009-11-258-33/+32
|\ \ | |/
| * Namespace build fails for webkit exampleRichard Moe Gustavsen2009-11-241-0/+2
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-201-1/+1
| |\