diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 13:29:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 13:29:26 (GMT) |
| commit | 07f724cd5abd0548fb32ed3469bde113daf028c4 (patch) | |
| tree | cbc086e99d0f59ccde3ac314d6165e7806fc613a /src/declarative/util/qdeclarativeopenmetaobject.cpp | |
| parent | c5a0190054421ac5c3325bba6835b63c70b6bda2 (diff) | |
| parent | b53f7d4ce3d5d9af47daf78c9f831acc532e688b (diff) | |
| download | Qt-07f724cd5abd0548fb32ed3469bde113daf028c4.zip Qt-07f724cd5abd0548fb32ed3469bde113daf028c4.tar.gz Qt-07f724cd5abd0548fb32ed3469bde113daf028c4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QListView: Re-fix scrollbar ranges
Fix compile error with QT_NO_GRAPHICSVIEW in QtMultimedia
Fix compile error with QT_NO_IMAGEFORMAT_XPM in QtGui
Wrap EGL image function pointers and move into QEgl namespace
Fix compilation of ShivaVG, which does not have EGL.
Move nativePaintingActive flag to GL2 engine's private
More adjustments to QTBUG-6800
Adjustments to QTBUG-6800 patch.
QTBUG-6800 patch included, but only for OpenGL 2.0
Support building with desktop OpenGL managed via EGL
Print more information when debugging X11 Visual selection
Fix gcc compile warning in qstatictext.cpp
Avoid taking sqrt of negative number in FT font engine
Diffstat (limited to 'src/declarative/util/qdeclarativeopenmetaobject.cpp')
0 files changed, 0 insertions, 0 deletions