summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-3028-61/+86
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-3012-12/+15
| |\
| * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-3021-128/+103
| |\ \
| * | | Doc.Michael Brasser2009-10-3023-39/+39
| * | | qdoc3: display 'read-only' in QML docs for read only properties.Michael Brasser2009-10-304-6/+33
| * | | qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14
* | | | change cities in clock exampleYann Bodson2009-10-302-5/+5
| |_|/ |/| |
* | | cleanupYann Bodson2009-10-3012-12/+15
| |/ |/|
* | cleanupYann Bodson2009-10-3016-41/+12
* | improve clock exampleYann Bodson2009-10-307-37/+41
|/
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-293-7/+47
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-2996-700/+2457
| |\
| * | Add local highscores to SameGameAlan Alpert2009-10-293-7/+47
* | | Add attached properties typeinfoAaron Kennedy2009-10-292-0/+2
* | | Testcase for warnings at shutdownAaron Kennedy2009-10-292-0/+30
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-2920-501/+297
|\ \
| * | Save a little more memory.Martin Jones2009-10-293-13/+15
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-2912-466/+250
| |\ \
| | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-29184-8441/+21638
| | |\ \ | | | |/
| | | * Remove duplicated docAlan Alpert2009-10-291-78/+0
| | | * Merge QmlComponentJS into QmlComponentAlan Alpert2009-10-299-319/+69
| | * | DocAlan Alpert2009-10-291-2/+2
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-28122-358/+817
| | |\ \
| | * | | Fill out QML global object documentationAlan Alpert2009-10-284-118/+180
| | * | | Minor cleanup of global objectAlan Alpert2009-10-282-11/+9
| * | | | Store filename as a QUrl rather than convert to QString.Martin Jones2009-10-293-12/+12
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-2991-807/+21401
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Avoid unnecessary viewport scrolling when bringing currentItem into view.Martin Jones2009-10-292-10/+20
* | | | | Merge branch '4.6' of ../qt-widget-team into kinetic-declarativeuiAaron Kennedy2009-10-291-2/+2
|\ \ \ \ \
| * | | | | Compile with -no-qt3supportAaron Kennedy2009-10-291-2/+2
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into kinet...Aaron Kennedy2009-10-2984-596/+2229
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Fix warning in qvariant.h header + make sure QVariant in QVariant works as ex...Olivier Goffart2009-10-282-27/+257
| * | | | Fixed bug in QTableView spans.Gabriel de Dietrich2009-10-283-2/+85
| * | | | Fixed missing repaints on QTreeView when moving the mouseThierry Bastian2009-10-281-2/+6
| * | | | Extand test of qBinaryFindOlivier Goffart2009-10-281-1/+16
| * | | | Use qLowerBound in qBinaryFindPascal Létourneau2009-10-281-32/+10
| * | | | Wrong caching of opaque children in QWidget.Bjørn Erik Nilsen2009-10-283-14/+51
| * | | | Stabilize tst_QGraphicsView::optimizationFlags_dontSavePainterState2Bjørn Erik Nilsen2009-10-281-2/+6
| * | | | Compile on 64bitOlivier Goffart2009-10-281-2/+2
| * | | | Allow to put the central widget in a QMainWindow after it was shownThierry Bastian2009-10-282-6/+9
| * | | | Changing the time we wait for the end of the animationThierry Bastian2009-10-281-3/+3
| * | | | Make the QPropertyAnimation pass on windows by waiting slightly longerThierry Bastian2009-10-281-4/+4
| * | | | Fix initial focus bug in ItemIsFocusScope.Andreas Aardal Hanssen2009-10-282-14/+112
| * | | | Double-clicking a dock widget titlebar could make it disappearThierry Bastian2009-10-282-4/+25
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-289-20/+160
| |\ \ \ \
| | * | | | QSplitter would not show previously collapsed widgets.Gabriel de Dietrich2009-10-282-2/+49
| | * | | | Qt::escape(): also escape the quote (")Olivier Goffart2009-10-283-24/+32
| | * | | | Fix XML entities in QTextDocument::toHtml()Thorvald Natvig2009-10-283-9/+57
| | * | | | Let QGraphicsItem set QObjectPrivate::wasDeleted when appropriate.Andreas Aardal Hanssen2009-10-283-7/+44
| * | | | | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-10-281399-12672/+37285
| |\ \ \ \ \ | | |/ / / / | |/| | | |