summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-225-60/+88
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2218-352/+498
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2118-352/+498
| |\
| | * Fall back to Qt for loading images with DICAPS_COLORKEY.Anders Bakken2010-10-211-7/+11
| | * Implement QWidget::metric PdmNumColors for QWSAnders Bakken2010-10-211-0/+24
| | * Adding ::scroll capabilities to live pixmaps.Michael Dominic K2010-10-212-3/+70
| | * Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-2116-345/+396
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-222-21/+23
|\ \ \ | |/ / |/| |
| * | Fix Flipable docsBea Lam2010-10-222-21/+23
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-211-2/+0
|\ \ | |/ |/|
| * Remove unnecessary roundingAlan Alpert2010-10-211-2/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-213-2/+82
|\ \
| * | In meego, support Format_RGB32 too for eglShared images.Michael Dominic K2010-10-211-2/+3
| * | Make sure d->ranges does not have invalid ranges before processing it.Stephen Kelly2010-10-212-0/+79
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-212-9/+27
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-212-3/+29
| |\
| * | Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-212-9/+27
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-212-3/+29
|\ \ \ | |/ / |/| / | |/
| * Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-212-3/+29
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-201-2/+19
|\
| * Fixed font rendering in manually built Qt on ARMv6.Samuel Rødal2010-10-201-2/+19
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-205-20/+166
|\ \
| * | Don't allow posted events to starve native messages.Bradley T. Hughes2010-10-201-16/+2
| * | Fix autotest failure with experimental client decoHarald Fernengel2010-10-202-3/+5
| * | fix a translation bug in qt_zh_CN.tsliang jian2010-10-201-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-201-0/+158
| |\ \ | | |/ | |/|
| | * Add skeleton changes file for Qt 4.7.2Jason McDonald2010-10-201-0/+158
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-203-51/+40
|\ \ \
| * | | Ensure we don't refill the view before all model changes are complete.Martin Jones2010-10-202-21/+27
| * | | ListView item insertion didn't handle delayed item removal correctly.Martin Jones2010-10-202-30/+13
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-206-41/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.Jani Hautakangas2010-10-206-41/+40
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-205-8/+50
|\ \ \ | |/ / |/| / | |/
| * Fix conflict between QDeclarativeGraphics_DerivedObject declared both in qdec...Joona Petrell2010-10-201-2/+2
| * Fix position of synthesized semicolon tokens.Aaron Kennedy2010-10-204-6/+48
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-206-7/+21
|\ \ | |/
| * Further focus scope fixes.Michael Brasser2010-10-193-7/+19
| * Fix visual test.Michael Brasser2010-10-192-0/+0
| * Fix recording of visual tests.Michael Brasser2010-10-191-0/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1975-4020/+3515
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1975-4020/+3515
| |\
| | * Tic-tac-toe: Fix z-order of status text.Daniel Molkentin2010-10-191-16/+18
| | * Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-1933-2658/+2697
| | * Properties take precedence over methodsAaron Kennedy2010-10-192-6/+6
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-10-191-1/+1
| | |\
| | | * Fix Twitter demo's list view for devicesJoona Petrell2010-10-191-1/+1
| | * | Call the correct vme meta object when connecting alias signalsAaron Kennedy2010-10-194-7/+52
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1934-1332/+741
| | |\
| | | * Fix QDeclarativeTextLayout under non-affine transformationAaron Kennedy2010-10-181-1/+1
| | | * Fix visual tests.Michael Brasser2010-10-1829-1289/+685