summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-1936-382/+2672
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-stagingaavit2011-04-121-1/+9
|\
| * Update XCreateWindow in qgl_X11egl.cppJuanZhao2011-04-121-1/+9
| * Merge remote branch 'qt-mainline/master'aavit2011-04-0728-254/+1169
| |\
* | \ Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-093-20/+31
|\ \ \
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-093-20/+31
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-092-17/+30
| | |\ \ \
| | | * | | [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)Arnold Konrad2011-04-081-9/+25
| | | * | | HTTP cacheing: do not store the date header with the resourcePeter Hartmann2011-04-081-8/+5
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-081-3/+1
| | |\ \ \ \
| | | * | | | Let's not write to the source buffer when blending argb32 on rgb16.Samuel Rødal2011-04-081-3/+1
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-04-093-13/+13
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-073-13/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Fix typos in QSharedPointer documentation.Jason McDonald2011-04-061-11/+11
| | * | | | | | | Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-24878-10790/+50350
| | |\ \ \ \ \ \ \
| | * | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-103970-3982/+3982
* | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-088-36/+63
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-088-36/+63
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-084-24/+34
| | |\ \ \ \ \ \ \
| | | * | | | | | | Cocoa: p1 bug fix: fix auto test regressionsRichard Moe Gustavsen2011-04-071-5/+10
| | | * | | | | | | Cocoa: p1 bug fix: revert use of subWindowStackingRichard Moe Gustavsen2011-04-064-24/+29
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-072-10/+22
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Image w/ PreserveAspectFit has its width changed once more than needed.Martin Jones2011-04-072-10/+22
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-072-2/+7
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Ensure shared network session deleted from correct threadShane Kearns2011-04-071-1/+6
| | | * | | | | | | | Revert "Remove SIGBUS emission from QNetworkSession destruction."Adrian Constantin2011-04-071-1/+1
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-081-4/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix QLocalSocket::isValid() on WindowsJoerg Bornemann2011-04-061-4/+1
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-078-138/+133
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Avoid compilation warnings on Symbianaavit2011-04-063-3/+5
| * | | | | | | | | | Get rid of double conversions and arithmetic when qreal is float.Samuel Rødal2011-04-065-135/+128
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0733-242/+370
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-072-1/+9
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debugKai Koehne2011-04-062-1/+9
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-064-20/+4
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0536-203/+419
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-051-4/+1
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-2921-60/+239
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Doc: Fixed markup.David Boddie2011-03-251-2/+2
| | * | | | | | | | | | | Doc: Added a missing command.David Boddie2011-03-251-1/+1
| | * | | | | | | | | | | Doc: Removed duplicate documentation.David Boddie2011-03-251-13/+0
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-061-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Not possible to enter negative values to widgets with numeric fieldsSami Merila2011-04-061-0/+2
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-064-81/+186
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-064-81/+186
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-052-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Removing extra comma in `enum' declaration.Sergio Ahumada2011-04-051-1/+1
| | * | | | | | | | | | | | Remove SIGBUS emission from QNetworkSession destruction.Cristiano di Flora2011-04-051-1/+1
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-051-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Take phonon backend back in qt.ibyGuoqing Zhang2011-04-051-5/+2