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 | ||||
* | | Added 'parallel_test' for some QGraphics* auto-tests. | Yoann Lopes | 2010-04-22 | 1 | -0/+1 |
|/ | |||||
* | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 1 | -1/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Let QGraphicsItem set QObjectPrivate::wasDeleted when appropriate. | Andreas Aardal Hanssen | 2009-10-28 | 1 | -0/+42 |
| | | | | | | | | | | | | | | | This change allows children of QGraphicsObject-derived classes to check if the parent is being deleted by checking the private flag wasDeleted. Reverts 37b16d5cbb4e7bc534f690ebf50434d228b5ecfc, p4 change 9681, to allow QGraphicsItem to set QObjectPrivate's wasDeleted member before entering QObjectPrivate's destructor. The original code was in there to let the user know, via the console output, that QObject was double-deleted (e.g., when placing QObject on the stack, and also giving it a parent, so that if the parent is deleted first, bang). Reviewed-by: Aaron Kennedy Reviewed-by: Bradley T. Hughes | ||||
* | Update license headers again. | Jason McDonald | 2009-09-09 | 1 | -4/+4 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update tech preview license header for files that are new in 4.6. | Jason McDonald | 2009-08-31 | 1 | -13/+13 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 1 | -1/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update license headers in files that are new in 4.6. | Jason McDonald | 2009-06-17 | 1 | -2/+2 |
| | | | | Reviewed-by: Trust Me | ||||
* | added properties for x,y and z. Removed the notify for the pos property, | Lars Knoll | 2009-06-11 | 2 | -0/+257 |
add auto tests for QGraphicsObject FX items are better off with property notifications on each component rather than on the position. Added some basic testing for QGraphicsObject and fixed the failures exposed. Reviewed-by: Andreas |