summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-04-186-36/+12
|\
| * Remove autotest code related to old Qt versionsJason McDonald2011-04-185-36/+2
| * Fix missing equality and inequality operator docs for QPointer.Jason McDonald2011-04-181-0/+10
|/
* Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-04-15143-1284/+5284
|\
| * Lighthouse: Fix license headersJørgen Lind2011-04-151-0/+43
| * Remove hasOpenGL. This changes breaks binary compatibillityJørgen Lind2011-04-1417-37/+35
| * Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-141968-97755/+194973
| |\ | |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-132-17/+12
|\ \
| * | Remove a race condition in SIGCHLD handler.Thiago Macieira2011-04-131-15/+10
| * | Fix warnings about && inside ||Thiago Macieira2011-04-131-2/+2
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-1315-33/+160
|\ \ \
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-1215-33/+160
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-1210-31/+136
| | |\ \ \
| | | * | | Allow enum values to be used as signal parametersBea Lam2011-04-128-28/+94
| | | * | | ListModel::clear() should not clear rolesBea Lam2011-04-122-3/+42
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-111-1/+1
| | |\ \ \ \
| | | * | | | Cocoa: Fixup wrong code in patch baaa5aeRichard Moe Gustavsen2011-04-111-1/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-114-1/+23
| | |\ \ \ \ \
| | | * | | | | Make sure removed QTextBlock is invalidJiang Jiang2011-04-114-1/+23
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-123-54/+153
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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 branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-11769-2666/+49718
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Lancelot: support for custom keys added to protocol. API cleanup.aavit2011-04-112-53/+144
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-04-115-170/+180
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-releng-team/master'Eckhart Koppen2011-04-11902-11954/+53355
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Updated QtOpenGL DEF fileEckhart Koppen2011-04-081-1/+1
| | * | | | | | | | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-08871-11658/+51823
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Updated QtOpenVG DEF fileEckhart Koppen2011-04-061-4/+6
| | * | | | | | | | | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-0632-294/+1528
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-05820-77589/+55210
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-05820-77589/+55210
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-041-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Updated QtGui DEF file for ARMV5Eckhart Koppen2011-04-041-0/+3
| * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-01203-1099/+76879
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Updated DEF filesEckhart Koppen2011-04-016-9/+35
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-04-114-51/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-11906-11772/+52069
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-105-9/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-074-8/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Lancelot: bail out if rendering consistently failsaavit2011-04-071-1/+10
| | * | | | | | | | | | | | | | Minor optimization to lance/elotaavit2011-04-071-1/+2
| | * | | | | | | | | | | | | | Make it possible to test the new font hinting in lance[elot]aavit2011-04-073-6/+52
| * | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-0770-857/+2276
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge remote branch 'qt-mainline/master'aavit2011-04-0769-856/+2275
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixes: The "test: too many arguments" error after every makeaavit2011-04-071-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-092-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2011-04-081-1/+3
| * | | | | | | | | | | | | | | | | Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2011-04-081-0/+1
* | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-095-22/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |