summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-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
| | | | * | | | Doc: Fixing doc bugs for the symbian platformMorten Engvoldsen2010-10-141-9/+18
| | | | * | | | Doc: Adding note to tier 2: The ppc architecture on Mac has been downgraded f...Morten Engvoldsen2010-10-141-0/+2
| | * | | | | | Changed Javascript guide link in Intro to the QML Language page.Jerome Pasion2010-10-152-3/+8
| | |/ / / / /
| | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-145-2/+120
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1
| |/ / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-181-1/+64
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Add additional documentation for the qmltime benchmark.Michael Brasser2010-10-181-1/+64
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1632-163/+1063
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Olivier Goffart2010-10-162-19/+6
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1534-169/+1082
| |\ \ \ |/ / / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1534-169/+1082
| |\ \ \
| | * | | Disable the unified toolbar before enteringFabien Freling2010-10-153-2/+37
| | * | | QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-152-6/+19
| | * | | Fix tst_moduleqt47::accidentalImportOlivier Goffart2010-10-152-2/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-14654-3306/+5298
| | |\ \ \ | | | |_|/ | | |/| |