summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-20 12:10:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-20 12:10:06 (GMT)
commit0fd2c492ee2e8317a5fbb0fb446816df53d5b17b (patch)
tree0e2cb6a5a264b95ba5f38a0c279f730cb1fcbdc7 /src/dbus
parent7f11c900e9184565321c09533b468abb047129b8 (diff)
parent6c8dcd5744e2c14d122f0967de72a9e171dd9715 (diff)
downloadQt-0fd2c492ee2e8317a5fbb0fb446816df53d5b17b.zip
Qt-0fd2c492ee2e8317a5fbb0fb446816df53d5b17b.tar.gz
Qt-0fd2c492ee2e8317a5fbb0fb446816df53d5b17b.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: Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). Support multisampled pbuffers under Windows. tst_qpixmapfilter: Fix compilation in namespace qtextcodec_symbian: Add few aliases Give a warning in QPixmap::handle() if pixmap is not X11 class. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fixed compilation of MeeGo graphics system without eglext.h Fixed memory corruption issue in qt_blurImage for Indexed8 images.
Diffstat (limited to 'src/dbus')
0 files changed, 0 insertions, 0 deletions