summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-121-1/+9
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-121-1/+9
| |\
| | * 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 remote-tracking branch 'qt/master'Sami Lempinen2011-04-125-169/+179
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-04-115-170/+180
| |\ \ \ \
| | * | | | Updated QtOpenGL DEF fileEckhart Koppen2011-04-081-1/+1
| | * | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-08149-8952/+2225
| | |\ \ \ \
| | * | | | | Updated QtOpenVG DEF fileEckhart Koppen2011-04-061-4/+6
| | * | | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-0617-222/+1013
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-05336-61944/+29077
| | |\ \ \ \ \ \
| | * | | | | | | Updated QtGui DEF file for ARMV5Eckhart Koppen2011-04-041-0/+3
| | * | | | | | | Updated DEF filesEckhart Koppen2011-04-016-9/+35
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-0125-107/+112
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-11158-8959/+2301
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
* | | | | | | | | | Add focus frame support in style sheetGuoqing Zhang2011-04-121-0/+7
* | | | | | | | | | Fix OpenGL build break on SymbianGuoqing Zhang2011-04-121-1/+1
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamGuoqing Zhang2011-04-111-10/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove workaround and fix properlySami Merila2011-04-071-10/+2
| * | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-061-0/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-05644-64636/+41725
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Remove obsolete files from qt.ibyMiikka Heikkinen2011-04-041-13/+0
* | | | | | | | | 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