summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-158-18/+18
|\ \
| * | Fix memory leak in QXmlQuery::setQuery.Niklas Kurkisuo2011-05-138-18/+18
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-134-38/+48
|\ \ \ | |/ / |/| |
| * | 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-133-4/+36
|\ \ \
| * | | QDeclarativeMouseArea: block context menu eventsCaio Marcelo de Oliveira Filho2011-05-132-0/+29
| * | | ListViews loses items if all visible items are removed.Martin Jones2011-05-131-4/+7
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-131-1/+1
|\ \ \ \ | |/ / /
| * | | Make TextEdit word selection more natural.Andrew den Exter2011-05-131-1/+1
* | | | 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-121-1/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Ensure the TextEdit cursor delegate is repositioned on mouse events.Andrew den Exter2011-05-121-1/+3
* | | | 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
| * | | | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-1028-17/+726
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-101-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix Symbian/WinsCW build breakSami Merila2011-05-101-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-092-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-092-0/+4
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-092-2/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | emit QNetWorkAccessManager::finished on QNetworkReply::abort()Martin Petersson2011-05-091-0/+2
| * | | | Fix -no-guiBernhard Rosenkraenzer2011-05-091-2/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-062-4/+7
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | fix random miscompilation with msvcOswald Buddenhagen2011-05-061-0/+1
| * | | make QLibraryInfo return clean pathsOswald Buddenhagen2011-05-061-4/+6
| * | | make relative paths in qt.conf work inside qmakeOswald Buddenhagen2011-05-061-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-051-4/+4
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | QNAM: Re-order checks in migrateBackend()Markus Goetz2011-05-051-4/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-056-4/+36
|\ \ \
| * | | Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-054-1/+19
| * | | Fix initial main window dimensions for "fullscreen with softkeys" caseMiikka Heikkinen2011-05-051-0/+5
| * | | Fix QNetworkConfigurationManager usage outside main thread firstShane Kearns2011-05-041-3/+12
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-053-0/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Views do not notify count changes properlyMartin Jones2011-05-053-0/+9
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-052-0/+4
|\ \ \ \ | |/ / /