summaryrefslogtreecommitdiffstats
path: root/examples/webkit/imageanalyzer
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-015-10/+10
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-115-5/+5
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-175-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-105-5/+5
| | | | | | | | Reviewed-by: Trust Me
| * 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
|/ | | | trys -> tries
* 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-0413-0/+550
Originally written by Jervey Kong. Task-number: QTBUG-14154 Reviewed-by: David Boddie