summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-215-15/+46
|\
| * 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-212-2/+16
| |\ \ | | |/ | |/|
| | * 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-211-0/+13
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-211-2/+3
| |\ \ | | |/
| | * Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-211-2/+3
| * | Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-212-9/+27
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2052-2826/+2868
|\ \ | |/
| * 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-202-17/+3
| |\ \
| | * | 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-201-1/+1
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-202-51/+31
| |\ \
| | * | 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-201-30/+4
| | |/
| * | 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
| * | Fix position of synthesized semicolon tokens.Aaron Kennedy2010-10-201-6/+9
| |/
| * Further focus scope fixes.Michael Brasser2010-10-191-7/+12
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1939-2702/+2754
| |\
| | * Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-1933-2658/+2697
| | * Call the correct vme meta object when connecting alias signalsAaron Kennedy2010-10-191-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-195-43/+56
| | |\
| | | * Fix QDeclarativeTextLayout under non-affine transformationAaron Kennedy2010-10-181-1/+1
| | | * 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-2052-1333/+1446
|\ \ \ \ | |/ / /
| * | | 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-181-0/+2
| |\ \ \
| | * | | 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-186-14/+130
| |\ \ \ | | |_|/ | |/| |
| | * | In meego graphics system remove a redundant check.Michael Dominic K2010-10-181-1/+1
| | * | Removing glFinish calls in eglSharedImage code. Not needed anymore.Michael Dominic K2010-10-181-10/+0
| | * | ::copy on the QMeeGoPixmapData creates a raster-backed pixmap.Michael Dominic K2010-10-185-2/+124
| | * | Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriateJ-P Nurmi2010-10-181-1/+5
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-1842-1309/+1277
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1613-62/+383
| | |\ \ | | | |/
| | | * Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Olivier Goffart2010-10-161-9/+6
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1520-85/+434
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1520-85/+434
| | | | |\
| | | | | * Disable the unified toolbar before enteringFabien Freling2010-10-153-2/+37
| | | | | * QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-151-6/+9