summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-08 02:43:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-08 02:43:53 (GMT)
commit12db2eac862eb1e24cb106da0a33130d4a90a80b (patch)
treea4b280ab5caaafb4b47e955655e7669a55686c55 /mkspecs
parent76b8cc4f12e8211bb5bb26f44613ac1d2ffcb5e7 (diff)
parentcf5fd899032391f0b98ff343b0808007c3a5903f (diff)
downloadQt-12db2eac862eb1e24cb106da0a33130d4a90a80b.zip
Qt-12db2eac862eb1e24cb106da0a33130d4a90a80b.tar.gz
Qt-12db2eac862eb1e24cb106da0a33130d4a90a80b.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: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions