summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-1381-397/+1322
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1337-145/+683
| |\
| | * Build on SymbianMartin Jones2010-12-121-13/+13
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1137-138/+676
| | |\ | |/ /
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1037-138/+676
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-1037-138/+676
| | | |\
| | | | * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-104-7/+7
| | | | * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-106-18/+18
| | | | * QmlViewer: Fix crash on exitKai Koehne2010-12-101-21/+21
| | | | * PathView: removing the currentIndex could make it invalid.Martin Jones2010-12-102-1/+5
| | | | * 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-1027-88/+613
| | | | |\
| | | | | * Improvements to anchoring docsBea Lam2010-12-092-17/+51
| | | | | * 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-0925-68/+546
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0925-68/+546
| | | | | | |\
| | | | | | | * 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-0921-77/+308
| | | | | | | |\
| | | | | | | * | highlightFollowsCurrentItem: false was not always honoredMartin Jones2010-12-096-20/+44
| | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0821-46/+498
| | | | | | | |\ \
| | | | | | | | * | ListView: Fix calculation of currentItem position when out of view.Martin Jones2010-12-083-5/+102
| | | | | | | | * | 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-0615-40/+394
| | | | | | | | |\ \
| | | | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0615-40/+394
| | | | | | | | | |\ \
| | | | | | | | | | * | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-064-1/+156
| | | | | | | | | | * | Some doc clarification for components and javascript integrationBea Lam2010-12-062-15/+18
| | | | | | | | | | * | 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-066-22/+207
| | | | | | | | | | * | 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-1 into 4.7-integ...Qt Continuous Integration System2010-12-111-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-101-0/+7
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| | * | | | | | | | | | refuse to open empty translation filesOswald Buddenhagen2010-12-101-0/+7
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-101-5/+27
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix qwidget test crashMiikka Heikkinen2010-12-101-5/+27
| * | | | | | | | | | | | 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-104-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | fix path separator matchingOswald Buddenhagen2010-12-101-2/+2
| | * | | | | | | | | | fix -dont-process for mingw cross-buildOswald Buddenhagen2010-12-101-1/+3
| | * | | | | | | | | | fix nonsense conditionOswald Buddenhagen2010-12-101-1/+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
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | 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-094-6/+35
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-094-6/+35
| | |\ \ \ \ \ \ \
| | | * | | | | | | 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-092-2/+25
| | | * | | | | | | Fixed missing text in GL 2 engine after recreating a context.Samuel Rødal2010-12-091-1/+3