summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| |/
* | 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-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-upstream' into 4.7-docA-Team2010-10-1395-604/+1460
| | | | |\
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-131-1/+1
| | | | |\ \
| | | | | * | Doc: adjusting the search field widthMorten Engvoldsen2010-10-131-1/+1
| | | | * | | Fixed statement about const_iterator and some whitespace fixes.Jerome Pasion2010-10-132-3/+3
| | | | |/ /
| | | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-129-26/+30
| | | | |\ \
| | | | * | | Doc - remove disclaimerLeena Miettinen2010-10-121-11/+7
| | | | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-116-15/+117
| | | | |\ \ \
| | | | * | | | Added the default format of QTime::toString().Jerome Pasion2010-10-111-0/+1
| | | | * | | | Moved the property documentation to its proper location.Jerome Pasion2010-10-111-0/+16
| | | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0912-26/+80
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0834-489/+734
| | | | |\ \ \ \ \
| | | | * | | | | | Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | | | * | | | | | Made several QMenuBar functions visible to qdoc and added documentation.Jerome Pasion2010-10-081-11/+19
| | | | * | | | | | Resized image, added missing files, and reformatted documentation ofJerome Pasion2010-10-087-57/+212
| | | | * | | | | | Fixed grammar mistake.Jerome Pasion2010-10-081-3/+3
| | | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-08136-1297/+4199
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0798-945/+3135
| | | | | |\ \ \ \ \ \
| | | | * | | | | | | | Doc: Update to Phonon overviewGeir Vattekar2010-10-081-19/+0
| | | * | | | | | | | | 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
| | | | | * | | | | | | | Correctly remove the egl alpha surface flags in meego graphics system.Michael Dominic K2010-10-131-1/+3
| | | | | * | | | | | | | Proper dither & proper alpha checking.Michael Dominic K2010-10-131-4/+4
| | | | | * | | | | | | | In meego graphics system, use always 16bit textures.Michael Dominic K2010-10-131-8/+40
| | | | | * | | | | | | | QCompleter: do not auto complete when directory is changed.Olivier Goffart2010-10-133-6/+87
| | | | | * | | | | | | | tst_qcompleter: Add a test for QFileSystemModelOlivier Goffart2010-10-131-6/+76
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-154-17/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | QNAM HTTP: Fix error signal emission for unreachable IPsMarkus Goetz2010-10-151-2/+12
| * | | | | | | | | | | | | Cocoa: small update to 534ba3c7314820604ba5aeeffa6051c91e7c1d09Richard Moe Gustavsen2010-10-151-5/+8