summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0455-397/+2087
|\
| * Fix errors in example code. Also reverts the example code to the oldBea Lam2010-11-043-21/+27
| * Largely rewrite the Using QML in C++ Applications documentation. ItBea Lam2010-11-0450-369/+1973
| * Document list type operationsBea Lam2010-11-042-7/+87
* | Maintain passing visualtests on X11Alan Alpert2010-11-0410-3/+925
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0422-373/+412
|\ \ | |/
| * Fix regression in 648eb76c and update visual tests.Martin Jones2010-11-0417-369/+370
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-043-0/+32
| |\
| | * Add testcase for QTBUG-13719.Michael Brasser2010-11-043-0/+32
| * | Don't emit xChanged()/yChanged() twice.Martin Jones2010-11-042-4/+10
| |/
* | Doc fixAlan Alpert2010-11-041-1/+5
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0340-88/+3224
|\
| * highlightranges.qml example and visual test contained binding loop.Martin Jones2010-11-032-13/+19
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-0321-16/+965
| |\
| | * Regression: QDeclarativeText does not update when text turns emptyYann Bodson2010-11-037-0/+751
| | * Qml Debugging: Only enable if explicitly requestedKai Koehne2010-11-0212-4/+49
| | * Regression: Text element breaks when using \n for separating linesYann Bodson2010-11-023-12/+165
| * | Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.Martin Jones2010-11-0311-43/+2181
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-028-81/+376
| |\
| * | Removing a binding while it is being applied caused a crash.Martin Jones2010-11-026-16/+59
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-034-3/+25
|\ \ \
| * | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-035-27/+43
|\ \ \ | |/ / |/| |
| * | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
| * | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+2
| * | german translation: minor additions + fixesFrederik Schwarzer2010-11-022-7/+34
| * | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-018-81/+376
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-018-81/+376
| |\ |/ /
| * QNAM HTTP: tst_qnetworkreply with setReadBufferSize() setDavid Faure2010-11-011-71/+366
| * Fix compilation on AIX 5.3 with gccKent Hansen2010-11-011-1/+1
| * Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-015-8/+8
| |\
| | * Fix poor English in QStyle::polish documentation.Jason McDonald2010-11-011-4/+4
| | * Fix a few typos in comments and docs.Jason McDonald2010-11-014-4/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-013-1/+60
|\ \ \
| * | | Quickly clicking an item that doesn't use double clicking should result in tw...Joona Petrell2010-11-013-1/+60
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-011-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix OpenVG painting artifacts after restoreState().Jason Barron2010-11-011-0/+1
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0168-5595/+11728
|\ \ \ | |/ / |/| / | |/
| * Fix QML visual tests on Mac.Yann Bodson2010-11-0168-5595/+11728
|/
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-302-0/+36
|\
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-302-0/+36
| |\ |/ /
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-272-0/+36
| |\
| | * Fix Windows compilation.Samuel Rødal2010-10-272-0/+2
| | * Fixed race condition in raster paint engine.Samuel Rødal2010-10-272-0/+34
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-292-12/+17
|\ \
| * | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
| * | Fix memory leak on exitHarald Fernengel2010-10-291-8/+13
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2966-32/+19931
|\ \ \