summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* When asking for relations, don't crash on children that don't return an inter...Frederik Gladhorn2011-05-191-4/+7
* Merge branch '4.8-upstream'Thierry Bastian2011-05-19665-11977/+19685
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-1816-96/+130
| |\
| | * Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-18244-8551/+2354
| | |\
| | * \ Merge remote-tracking branch 'earth-staging/master'Olivier Goffart2011-05-182-39/+56
| | |\ \
| | | * | Symbian socket: Implement systemProxyForQuery for service networksShane Kearns2011-05-182-39/+56
| | * | | tst_q3dns: update test to follow RFC-5952.Martin Petersson2011-05-181-1/+1
| | |/ /
| | * | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-16148-190/+9725
| | |\ \
| | * | | Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindowRichard Moe Gustavsen2011-05-111-1/+1
| | * | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-1170-385/+1689
| | |\ \ \
| | * | | | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-0910-35/+21
| | * | | | Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-062-20/+51
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-05-183-1/+24
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII...Simon Hausmann2011-05-162-1/+18
| | * | | | Fix crashes with regular expressions QtScript on ARM traditional architecturesSimon Hausmann2011-05-161-0/+6
| | | |_|/ | | |/| |
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-1764-116/+785
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-16148-190/+9725
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-145-40/+52
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-135-40/+52
| | | |\ \ \ \
| | | | * | | | Fix instability in QNetworkConfigurationManager autotestShane Kearns2011-05-131-2/+4
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-05-131-15/+20
| | | | |\ \ \ \
| | | | | * | | | Fix softkey icon positioning in S60 5.3Miikka Heikkinen2011-05-131-15/+20
| | | | * | | | | Support word selection list with predictive text from splitviewSami Merila2011-05-133-23/+28
| | | | |/ / / /
| | * | | | | | Fix thread safety regression of QNetworkConfigurationManagerShane Kearns2011-05-132-2/+2
| | * | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-1313-8/+189
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-136-4/+131
| | | |\ \ \ \ \
| | | | * | | | | QDeclarativeMouseArea: block context menu eventsCaio Marcelo de Oliveira Filho2011-05-134-0/+114
| | | | * | | | | ListViews loses items if all visible items are removed.Martin Jones2011-05-132-4/+17
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-133-1/+45
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Make TextEdit word selection more natural.Andrew den Exter2011-05-133-1/+45
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-123-3/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Clear confusion between QMainWindow and QMainWindowLayout.Fabien Freling2011-05-123-3/+1
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-0/+12
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Fix for rounded corners bug in QMenuJani Hautakangas2011-05-121-0/+12
| | * | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-126-13/+49
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | QWidgetPrivate::setParent_sys might be using null pointerSami Merila2011-05-121-1/+1
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-122-1/+23
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Ensure the TextEdit cursor delegate is repositioned on mouse events.Andrew den Exter2011-05-122-1/+23
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-121-1/+3
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Don't crash on an invalid replacementStart from an input method.Andrew den Exter2011-05-121-1/+3
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-111-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix incorrect hardware address on systems without getifaddrs()Craig Scott2011-05-111-1/+1
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-111-9/+21
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | * | | | | | | Enable multisampling on Symbian if hw supports itJani Hautakangas2011-05-111-9/+21
| | * | | | | | | | | CompileOlivier Goffart2011-05-121-1/+0
| | * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-1119-15/+313
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-1027-17/+713
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Fix QtCoreu.def file errorJani Hautakangas2011-05-101-13/+0
| | | | * | | | | | | Merge commit 'v4.7.3' into 4.7Eckhart Koppen2011-05-100-0/+0
| | | | |\ \ \ \ \ \ \