diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-16 19:30:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-16 19:30:00 (GMT) |
| commit | 95d3bd3fc993d7c8c1fe92960c617a3392d87f66 (patch) | |
| tree | 80fc13bd368c31c74d9b821155780f10081a380b /src/opengl/qgl_x11.cpp | |
| parent | 090827712933e587eb9308aabca49fc01a371f0e (diff) | |
| parent | 90d398e5bef2a66ab944e1cc191c1ad6569e321a (diff) | |
| download | Qt-95d3bd3fc993d7c8c1fe92960c617a3392d87f66.zip Qt-95d3bd3fc993d7c8c1fe92960c617a3392d87f66.tar.gz Qt-95d3bd3fc993d7c8c1fe92960c617a3392d87f66.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (201 commits)
Fix an issue with the error signal in a callWithCallback not being
Add skeleton changes file for 4.6.3.
Fixed compiler warning about making the same class a friend twice
New test cases for the QScriptString.
Fix a deadlock in kqueue implementation of QFileSystemWatcher
Don't crash when QTouchEvent is accepted but not handled by a
QNAM HTTP: Unify socket EOF handling a bit
doc: Added \section1 about serializing operators for Qt collections.
Update the composition demo at 60 FPS instead of at painting rate
Replace the inline blend function by #define
Fix for using QContiguousCache with default constructor or capacity=0
Correctly mark QGraphicsScene::drawItems() as obsolete
Compile fix on Mac with 10.5 sdk.
QTestLib: don't crash if data tag requested, none available
Implement the blend functions with SSE2
doc: Added some since version information.
Ignore touch and gesture events when excluding input events
Implemented GraphicsView Panel support for gestures.
doc: Fixed several typos.
Add MSVC-specific expected failures for JS test suite
...
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
0 files changed, 0 insertions, 0 deletions