summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-142-6/+2
|\
| * Abort working replies with error when network session fails.Aaron McCarthy2010-12-141-2/+2
| * qrgb565: Use the trivial qt_memconvert() and qt_rectconvert()Andreas Kling2010-12-131-4/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-142-0/+15
|\ \
| * | Remove active selection when TextEdit loses focusJoona Petrell2010-12-142-0/+15
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-142-2/+9
|\ \ \
| * | | Minor optimizationMiikka Heikkinen2010-12-131-2/+2
| * | | Fix crash when creating more than one QApplication in single test caseMiikka Heikkinen2010-12-131-0/+7
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-132-5/+49
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed GL 2 engine rendering of images / pixmaps above max texture size.Samuel Rødal2010-12-132-5/+49
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-131-9/+43
|\ \ \ | |_|/ |/| |
| * | Add a small protection against releasing a timer twice.Thiago Macieira2010-12-131-2/+12
| * | Use constants the timer ID masks instead of values everywhereThiago Macieira2010-12-131-4/+8
| * | Fix ABA problem with: the serial must be updated on all accessesThiago Macieira2010-12-131-1/+1
| * | Comment a bit more the timer ID allocation code.Thiago Macieira2010-12-131-2/+22
| |/
* | Ensure ListView contentHeight is set to a valid size.Martin Jones2010-12-131-0/+6
* | Fix dragging Flickable back over start point.Martin Jones2010-12-131-2/+2
* | A QAIM model resulted in items moving to incorrect locationsMartin Jones2010-12-131-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1014-66/+129
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1014-66/+129
| |\
| | * PathView: removing the currentIndex could make it invalid.Martin Jones2010-12-101-1/+1
| | * Fix broken database creation caused by previous fixBea Lam2010-12-101-8/+17
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1013-57/+111
| | |\
| | | * Improvements to anchoring docsBea Lam2010-12-091-0/+2
| | | * QDeclarativeProperty doc improvementsBea Lam2010-12-091-3/+16
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0912-54/+93
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0912-54/+93
| | | | |\
| | | | | * Update QtGui bwins def file for QTBUG-15615Joona Petrell2010-12-091-2/+4
| | | | | * Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-0916-71/+133
| | | | | |\
| | | | | * | highlightFollowsCurrentItem: false was not always honoredMartin Jones2010-12-092-11/+21
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0811-41/+68
| | | | | |\ \
| | | | | | * | ListView: Fix calculation of currentItem position when out of view.Martin Jones2010-12-081-4/+8
| | | | | | * | Update QtGui def filesJoona Petrell2010-12-072-0/+2
| | | | | | * | Fix openDatabaseSync() to not create unused directoryBea Lam2010-12-071-1/+0
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-067-36/+58
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-067-36/+58
| | | | | | | |\ \
| | | | | | | | * | Some doc clarification for components and javascript integrationBea Lam2010-12-061-12/+16
| | | | | | | | * | Cursor shouldn't blink while dragging cursor positionChristopher Ham2010-12-063-0/+11
| | | | | | | | * | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-062-22/+29
| | | | | | | | * | Doc: make it clear that "z" affects sibling stacking order.Martin Jones2010-12-051-2/+2
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-101-5/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Missing glyphs in GL when scaling QStaticText and QML text itemsEskil Abrahamsen Blomfeldt2010-12-101-5/+13
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-102-4/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't include <features.h> directly: non-standard header.Thiago Macieira2010-12-101-3/+2
| * | | | | | | | | Remove superfluous OpenGL linking for QtDeclarativeThiago Macieira2010-12-101-1/+0
| |/ / / / / / / /
* | | | | | | | | Corrected case on Symbian library.axis2010-12-101-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-092-4/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-092-4/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Try using pure scissor clip in GL 2 engine for rotations.Samuel Rødal2010-12-091-1/+5
| | * | | | | | | Fixed DeviceCoordinateCache items when using QGraphicsScene::render().Samuel Rødal2010-12-091-2/+2