diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-18 08:40:25 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-18 08:40:25 (GMT) |
commit | 17ebd795dbaaac494c408fb908cbc53acd0b0918 (patch) | |
tree | 247b025df8809993e7b08868990c45d958a22041 /translations/translations.pro | |
parent | babb444554958718c70fcc4f2ec73e3dfcc4dd11 (diff) | |
parent | 7798b525b159f6ce356e7d2319dece1b8c7fafe4 (diff) | |
download | Qt-17ebd795dbaaac494c408fb908cbc53acd0b0918.zip Qt-17ebd795dbaaac494c408fb908cbc53acd0b0918.tar.gz Qt-17ebd795dbaaac494c408fb908cbc53acd0b0918.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 'translations/translations.pro')
0 files changed, 0 insertions, 0 deletions