summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-177939-131573/+131580
|\
| * Updating file with CRLF line endings for the updated headerSergio Ahumada2011-05-171-29/+29
| * Fix a regression in QList::mid()Liang Qi2011-05-162-0/+5
| * update gitignoreOswald Buddenhagen2011-05-131-2/+5
| * remove -fno-stack-protectorOswald Buddenhagen2011-05-131-2/+1
| * Fix make confcleanAnders Bakken2011-05-131-4/+4
| * Update licenseheader text in source filesJyri Tahtela2011-05-137936-131576/+131576
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-161-2/+2
|\ \
| * | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-05-1518-174/+203
|\ \ \
| * \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-13339-2707/+30191
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-1310-156/+185
| | |\ \ \
| | * | | | Fix memory leak in QXmlQuery::setQuery.Niklas Kurkisuo2011-05-138-18/+18
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-121-3/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| | * | | | doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-121-26/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-119-145/+193
| |\ \ \ \ \ | | |/ / / /
| | * | | | doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-092-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-091-1/+1
| | |\ \ \ \
| | * | | | | doc: Fixed a QML snippet referenceMartin Smith2011-05-092-1/+2
* | | | | | | 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
| |/ / / / / /
* | | | | | | 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' 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
* | | | | | | | 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
| |\ \ \ \ \ \ \