Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Moving QCoreTextFontEngine with related classes into own file | Jørgen Lind | 2010-10-28 | 1 | -0/+1 |
|/ | | | | | | The declaration of QCoreTextFontEngine was ifdefed in qfontengine_p.h. So was QMacFontEngine. I have moved them into their own files (qfontengine_coretext_p.h and qfontengine_mac_p.h). | ||||
* | Add three new style-hints to QFont to match CSS' generic font families | Tor Arne Vestbø | 2010-07-08 | 1 | -0/+6 |
| | | | | | | | | The defaults were chosen to match major web browsers. See: http://xhva.net/log/?p=160 Reviewed-by: Simon Hausmann | ||||
* | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 1 | -1/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update license headers again. | Jason McDonald | 2009-09-09 | 1 | -4/+4 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update tech preview license header. | Jason McDonald | 2009-08-31 | 1 | -13/+13 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update license headers. | Jason McDonald | 2009-08-11 | 1 | -1/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 1 | -2/+2 |
| | | | | Reviewed-by: Trust Me | ||||
* | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 1 | -0/+158 |