summaryrefslogtreecommitdiffstats
path: root/doc/src/painting-and-printing
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-25 17:39:52 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-25 17:39:52 (GMT)
commit5a7223450d0ebd4eaa47f263005c6d1c2e142a76 (patch)
tree9970c8b78e0d5178fbf44bab0317212b2a8c7bdd /doc/src/painting-and-printing
parent77e5ced3e6b4c1c5ef05684de736bf4939dbe115 (diff)
parentd7d0aaf8bea4e6a5c4c0500a46417d7c788f489a (diff)
downloadQt-5a7223450d0ebd4eaa47f263005c6d1c2e142a76.zip
Qt-5a7223450d0ebd4eaa47f263005c6d1c2e142a76.tar.gz
Qt-5a7223450d0ebd4eaa47f263005c6d1c2e142a76.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (22 commits) Fix compilation of qegl.cpp after the last merge Fix a race condition with QtDBus blocking for replies. QtDBus: Debug message update Removed DEPLOYMENT from demos/spectrum/spectrum.pro Install source for spectrum demo Fixed path for copying launcher script for spectrum demo My 4.6.3 changes. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f ) Fixed an assert in QMenu Backport multitouch bug fixes to 4.6 tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64 Call eglTerminate() when the last QEglContext is destroyed to free mem. Removed double EINTR loop from nativeWrite and nativeRead. Fixed qsslkey test deployment for Symbian and fixed compiler warnings. Fixing the race condition in event dispatcher implementation on changes-4.6.3 updated Fixing the compile issue. Fixing the compile issue. Typo. Removed nearest test from qaudiodeviceinfo unit test. ...
Diffstat (limited to 'doc/src/painting-and-printing')
0 files changed, 0 insertions, 0 deletions