Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' | Jason Barron | 2009-08-04 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp | ||||
| * | Squashed commit of the topic/exceptions branch. | Harald Fernengel | 2009-08-03 | 1 | -1/+1 |
| | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;) | ||||
* | | Export QTextControl | Aaron Kennedy | 2009-07-31 | 1 | -1/+1 |
|/ | | | | | | This class is used in declarative. Reviewed-by: Andreas | ||||
* | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 1 | -2/+2 |
|\ | |||||
| * | 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/+303 |
| | |||||
* | some cleanups on private exported symbols | Thierry Bastian | 2009-05-26 | 1 | -1/+1 |
| | |||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 1 | -0/+303 |