Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 5 | -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 McDonald | 2011-01-10 | 5 | -5/+5 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Examples: Fix compilation with namespace. | Christian Kandeler | 2011-01-07 | 2 | -4/+4 |
| | | |||||
| * | Fixed many spelling errors. | Rohan McGovern | 2010-10-25 | 1 | -1/+1 |
| | | |||||
* | | compile fix for namespaced Qt | hjk | 2010-11-08 | 2 | -1/+5 |
| | | |||||
* | | Fixed spelling. | Rohan McGovern | 2010-10-25 | 1 | -1/+1 |
|/ | | | | trys -> tries | ||||
* | Added missing QtWebKit example files and some whitespace fixes. | Jerome Pasion | 2010-10-09 | 5 | -47/+198 |
| | |||||
* | Added the QtWebKit bridge Image Analyzer example. | Jerome Pasion | 2010-10-04 | 13 | -0/+550 |
Originally written by Jervey Kong. Task-number: QTBUG-14154 Reviewed-by: David Boddie |