summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/sqldatabase
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-30 19:57:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-30 19:57:34 (GMT)
commitb50077584b5be8406b5c71d5b1efe3a1ff5adce3 (patch)
tree0a016c89c711054323af8f8d6eb973d592074c63 /doc/src/snippets/sqldatabase
parent998569ea293741f16e0a7fb4a7a249e902966bf7 (diff)
parentd0f1f569e27f7f34f3bfc03bd759f28f7b567997 (diff)
downloadQt-b50077584b5be8406b5c71d5b1efe3a1ff5adce3.zip
Qt-b50077584b5be8406b5c71d5b1efe3a1ff5adce3.tar.gz
Qt-b50077584b5be8406b5c71d5b1efe3a1ff5adce3.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 QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
Diffstat (limited to 'doc/src/snippets/sqldatabase')
0 files changed, 0 insertions, 0 deletions