summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-0734-113/+460
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-09-0630-100/+381
| |\
| | * Add missing license headerJan-Arve Sæther2010-09-062-0/+82
| | * Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.Jan-Arve Sæther2010-09-062-0/+8
| | * Compile fix WinCEJan-Arve Sæther2010-09-032-5/+14
| | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-0328-100/+282
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-09-066-33/+685
| |\ \ | | |/ | |/|
| | * Fixed input context trying to squeeze content into a full widget.axis2010-09-062-3/+7
| | * Cleaned up position tracking in the Symbian input methods.axis2010-09-065-17/+679
| | * Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"axis2010-09-063-16/+2
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-09-012-5/+2
| |\
| | * Some small Solaris fixes.Pierre Rossi2010-08-312-5/+2
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-312-7/+70
| |\
| | * Fix QtScript Date <--> QDateTime (local time) conversionKent Hansen2010-08-312-7/+70
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-301-4/+9
| |\ \ | | |/
| | * Fix Qt applications freezing until mouse/keyboard events occur.Bradley T. Hughes2010-08-301-4/+9
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-271-0/+2
| |\
| | * Recognize GL_ARB_shader_objects as indicating shadersRhys Weatherley2010-08-271-0/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-071-15/+56
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-075-17/+73
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-0771-1469/+4245
| |\ \ \ \
| * | | | | ListView: Ensure highlight is positioned correctly in positionViewAtIndex().Martin Jones2010-09-071-15/+56
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-075-17/+73
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Pause orientation sensors in Qml Viewer when the application window is not ac...Joona Petrell2010-09-075-17/+73
| | |/ / / | |/| | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-071-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Increase maximum heap size of minehunt demo to fix crashing on SymbianJoona Petrell2010-09-071-0/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-064-105/+229
|\ \ \ \
| * | | | Allow Windows x64 to use SSE2 to speed up blendingliang jian2010-09-064-105/+229
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0654-1332/+3390
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | make shadow builds not write into the source dirOswald Buddenhagen2010-09-061-9/+17
| * | | | Fix failing tst_qmdisubwindow test after 71a3b1a0d3Tor Arne Vestbø2010-09-061-2/+4
| * | | | Doc: update the documentation of QUrl about HTML Form encodingThiago Macieira2010-09-061-0/+20
| * | | | search translator commentsOswald Buddenhagen2010-09-061-0/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0653-1323/+3349
| |\ \ \ \
| | * | | | Install translators earlier in assistantVictor Ostashevsky2010-09-061-2/+1
| | * | | | Fix compilation on ARM: don't include kernel headersThiago Macieira2010-09-061-2/+14
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Andy Shaw2010-09-061-4/+0
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-09-0640-336/+345
| | | |\ \ \ \
| | | * | | | | Doc: Updating known-issues page.Morten Engvoldsen2010-09-061-4/+0
| | * | | | | | Fix compilation of qmake with MSVCAndy Shaw2010-09-061-2/+3
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0651-1314/+3332
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0351-1314/+3332
| | | |\ \ \ \ \
| | | | * | | | | Recognize @, #, $ and ` as word separatorsThorbjørn Lindeijer2010-09-031-0/+4
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-0350-1314/+3328
| | | | |\ \ \ \ \
| | | | | * | | | | rebuild configure.exePeter Hartmann2010-09-031-0/+0
| | | | | * | | | | Fix dependencies so JOM will handle parallellization properlyMarius Storm-Olsen2010-09-031-2/+7
| | | | | * | | | | Symbian: Disable IPv6 for nowMarkus Goetz2010-09-032-3/+11
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-09-0350-827/+3321
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-032-2/+2
| | | | | | * | | | Accept empty authority segments in QUrl as different from not-presentThiago Macieira2010-09-032-1/+14