summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-29 11:32:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-29 11:32:03 (GMT)
commitbdc13bcc7b4d195d741142acce9b4e9b68c4d5e0 (patch)
treec5e74afb3f75790b2b64dc7964d54d4737851e9a /src/corelib
parentc02ef9eb331f03dbd59d2fd938c53b54f5c65cea (diff)
parentc76f9f15d1c604cdf3d68d2147a4a06d227871fa (diff)
downloadQt-bdc13bcc7b4d195d741142acce9b4e9b68c4d5e0.zip
Qt-bdc13bcc7b4d195d741142acce9b4e9b68c4d5e0.tar.gz
Qt-bdc13bcc7b4d195d741142acce9b4e9b68c4d5e0.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: Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions