summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-0313-125/+446
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-0213-125/+446
| |\ |/ /
| * Backport open pages switcher from Qt Creator.kh12010-06-028-30/+403
| * Remove in-page switcher.kh12010-06-025-75/+9
| * Add missing trace, small cleanup.kh12010-06-023-20/+34
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-06-02589-5892/+290189
|\ \
| * \ Merge remote branch 'origin/master' into qt-master-from-4.7Olivier Goffart2010-06-021-1/+0
| |\ \ | |/ / |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-019-1/+22
|\ \ \ | | |/ | |/|
| * | Examples: Fix compilation with namespaces.ck2010-06-019-1/+22
| | * Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-01589-5873/+290192
| | |\ | |/ / |/| |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-017-78/+148
| | |\
| | | * Doc: Fixed a typoGeir Vattekar2010-06-011-1/+1
| | | * Doc: QAbstractItemModel: note unexpected behavior with beginMoveRowsJohn Brooks2010-06-011-40/+52
| | | * Added environment variable graphicssystem switch.Andreas Hartmetz2010-06-011-3/+14
| | | * Fixed a problem where QPixmaps where re-bound in non-sharing contexts.Trond Kjernåsen2010-06-012-20/+67
| | | * Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.Andreas Aardal Hanssen2010-06-011-13/+6
| | | * Make sure we don't pull inn /usr/X11 stuff in the qws mkspek confJørgen Lind2010-06-011-0/+4
| | | * Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().Andreas Aardal Hanssen2010-06-011-1/+4
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0134-204/+529
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-012-3/+19
| | | |\ \
| | | | * | Documentation.Michael Brasser2010-06-011-1/+16
| | | | * | Optimization for sci file loading.Michael Brasser2010-06-011-2/+3
| | | * | | Missed file.Warwick Allison2010-06-011-0/+8
| | | |/ /
| | | * | Ensure text color set by S60 input method works for QML ItemsMartin Jones2010-06-011-8/+33
| | | * | License.Warwick Allison2010-06-011-0/+41
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-0161-321/+599
| | | |\ \
| | | | * | Test positionAt.Warwick Allison2010-06-011-0/+43
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-0160-320/+555
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0128-188/+323
| | | | | |\ \ | | | |_|/ / / | | |/| | | |
| | | | | * | Fix example code and imageBea Lam2010-06-011-0/+0
| | | | | * | Fix docYann Bodson2010-06-011-1/+1
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-313-226/+174
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-3125-183/+317
| | | | | | |\ \
| | | | | * | | | Fix some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
| | | | | * | | | Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3
| | | | | * | | | Fix TypoAlan Alpert2010-05-311-1/+1
| | | | | | |/ / | | | | | |/| |
| | | | | * | | Various doc fixes and improvementsBea Lam2010-05-3112-42/+159
| | | | | * | | Document issues with rectangle border width of 1 where clipping is usedBea Lam2010-05-313-2/+33
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-318-8/+39
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4Simon Hausmann2010-05-318-8/+39
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-3131-36/+143
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-3142-384/+375
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix QT_NO_TEXTHTMLPARSERTasuku Suzuki2010-05-312-0/+26
| | | | * | | | | | Fix QT_NO_DOMTasuku Suzuki2010-05-312-6/+6
| | | | * | | | | | Fix QT_NO_TEXTDATE compilation errors.Andreas Aardal Hanssen2010-05-315-1/+16
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Fix QT_NO_TEXTDATETasuku Suzuki2010-05-255-1/+16
| | | | * | | | | | | Fix QT_NO_TEXTSTREAM compilation errors.Tasuku Suzuki2010-05-317-0/+17
| | | | * | | | | | | Fix QT_NO_VALIDATOR compilation.Tasuku Suzuki2010-05-313-1/+12
| | | | * | | | | | | Doc: correcting docs in QDrag::execMorten Engvoldsen2010-05-311-1/+1
| | | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-312-1/+27
| | | | |\ \ \ \ \ \ \