diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-18 03:10:24 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-18 03:10:24 (GMT) |
commit | 7798b525b159f6ce356e7d2319dece1b8c7fafe4 (patch) | |
tree | 1b241acc70b02d23751ff02e5c29cfa4cb87fd50 /dist | |
parent | 9c1dc504c8f12858ab9c0b610bebb19019005eaa (diff) | |
parent | dd67b26734af6ebf83ef3b1be949631120846e59 (diff) | |
download | Qt-7798b525b159f6ce356e7d2319dece1b8c7fafe4.zip Qt-7798b525b159f6ce356e7d2319dece1b8c7fafe4.tar.gz Qt-7798b525b159f6ce356e7d2319dece1b8c7fafe4.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 'dist')
0 files changed, 0 insertions, 0 deletions