summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-20100-4149/+3851
|\
| * 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
| | | | * ListView.visibleArea.heightRatio should not emit a signal when it does not ch...Yann Bodson2010-10-183-13/+26
| | | | * Properties should have precedence over methods.Michael Brasser2010-10-181-29/+29
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-20102-1594/+2872
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-192-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Only add ICON for application projects in symbianpkgrules.priMiikka Heikkinen2010-10-192-2/+2
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-192-3/+8
| |\ \ \
| | * | | Fix partial upgrade package UID for libinfixed QtMiikka Heikkinen2010-10-191-1/+4
| | * | | Fixed recursive sis file generation.axis2010-10-191-2/+2
| | * | | Readded DESTDIR that was removed by mistake in a3c755e358596.axis2010-10-191-0/+2
| | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-191-8/+30
| |\ \ \ | | |/ / | |/| |
| | * | Fix crash on exit.Aaron McCarthy2010-10-191-8/+30
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-182-0/+6
| |\ \ \
| | * | | Prepend epocroot to extra target tools if they start with /epoc32/Miikka Heikkinen2010-10-181-0/+4
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-10-181-1/+64
| | |\ \ \
| | * | | | QS60Style: ComboBox disappears after orientation switchSami Merila2010-10-181-0/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-188-17/+163
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | In meego graphics system remove a redundant check.Michael Dominic K2010-10-181-1/+1
| | * | | | Use the real screen size in meegographics surface scaling, not hardcoded one.Michael Dominic K2010-10-181-3/+6