summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-212-30/+34
* Doc: Corrected the name property as it was incorrectly declared.David Boddie2010-10-211-1/+1
* 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
| | * | | 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 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
| | | |\ \
| | | | * | tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11Olivier Goffart2010-10-141-1/+2
| | | | * | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-14638-3205/+4339
| | | | |\ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1417-101/+958
| | | | |\ \ \
| | | | | * | | tst_qcompleter.cpp: fix test on mac.Olivier Goffart2010-10-141-1/+1
| | | | | * | | Fixed autotest that was missing focus on WindowsThierry Bastian2010-10-141-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-1317-101/+956
| | | | | |\ \ \
| | | | | | * | | QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-133-166/+188
| | | | | | * | | QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-133-191/+157
| | | | | | * | | Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-135-17/+678
| | | | | | * | | Adjust the parent index for the itemsMoved call.Stephen Kelly2010-10-133-4/+17
| | | | | | * | | Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-135-12/+20