summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/sqldatabase/sqldatabase.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-17 19:33:01 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-17 19:33:01 (GMT)
commitdd67b26734af6ebf83ef3b1be949631120846e59 (patch)
tree59fbaf56cd07e93605192af47376dbfb866dd48d /doc/src/snippets/sqldatabase/sqldatabase.pro
parentb53107577d64f4a3694a2184a3ccc87ed3aed3f2 (diff)
parent749ad26d255327c9fa3fe857a30983cc6dfef0d9 (diff)
downloadQt-dd67b26734af6ebf83ef3b1be949631120846e59.zip
Qt-dd67b26734af6ebf83ef3b1be949631120846e59.tar.gz
Qt-dd67b26734af6ebf83ef3b1be949631120846e59.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions