summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-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-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
| * | | | 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-182-1/+32
| | |/ / | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-182-2/+10
|\ \ \ \
| * | | | qmake/symbian: Make sure the destination directory exists before copyingMartin Storsjo2010-10-182-1/+6
| * | | | qmake/symbian: Don't give the -u flag to cp on Mac OS X, it isn't a standard ...Martin Storsjo2010-10-181-1/+4
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-1810-21/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-1884-1561/+2589
| |\ \ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1620-103/+996
| | |\ \ \ | | | |/ /
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1564-1458/+1593
| | |\ \ \
| * | | | | Corrected spelling mistake and whitespace fixes.Jerome Pasion2010-10-182-3/+3
| |/ / / /
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-1512-19/+163
| |\ \ \ \
| | * | | | Changed language of the AutoConnection description.Jerome Pasion2010-10-151-5/+5
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-154-9/+30
| | |\ \ \ \
| | | * \ \ \ Merge branch 'small' into 4.7Morten Engvoldsen2010-10-154-9/+30
| | | |\ \ \ \
| | | | * | | | Doc: Clearing details around default settings.Morten Engvoldsen2010-10-141-0/+1
| | | | * | | | Doc: making links more visible when they are visited.Morten Engvoldsen2010-10-141-0/+9