summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make twitter not depend on flickr exampleYann Bodson2009-10-3018-20/+172
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-10-30394-4592/+8666
|\ | | | | | | | | | | | | into kinetic-declarativeui Conflicts: examples/declarative/dial/main.cpp
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-30256-2112/+24210
| |\ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlcomponentjs.cpp src/declarative/qml/qmlcomponentjs_p.h src/declarative/qml/qmlcomponentjs_p_p.h
| * | fix macrosWarwick Allison2009-10-299-7/+27
| | |
| * | auto-detect declarativeWarwick Allison2009-10-291-4/+17
| | |
| * | fix headersWarwick Allison2009-10-2969-51/+2511
| | |
| * | fix headersWarwick Allison2009-10-29286-4537/+4617
| | |
| * | fix headersWarwick Allison2009-10-2942-56/+1598
| | |
| * | fix merge duplicationWarwick Allison2009-10-291-1/+0
| | |
* | | cleanup dial exampleYann Bodson2009-10-309-50/+15
| | |
* | | cleanupYann Bodson2009-10-303-2/+3
| | |
* | | small fixes to parallax exampleYann Bodson2009-10-302-27/+12
| | |
* | | fix twitter exampleYann Bodson2009-10-302-3/+3
| | |
* | | fix parallax exampleYann Bodson2009-10-302-7/+5
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-10-3028-61/+86
|\ \ | | | | | | | | | into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-3012-12/+15
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-3021-128/+103
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Doc.Michael Brasser2009-10-3023-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be explicit about element<->class relationship in docs. Until this is automatically set up by qdoc, we need to do it manually so things like the display of 'read-only' work properly.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#rotation-prop should now be this: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#transformOrigin-prop)
* | | | | 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 ↵Aaron Kennedy2009-10-293-7/+47
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-2996-700/+2457
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | 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 ↵Aaron Kennedy2009-10-2920-501/+297
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Save a little more memory.Martin Jones2009-10-293-13/+15
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-2912-466/+250
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-29184-8441/+21638
| | |\ \ \ | | | |/ / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Remove duplicated docAlan Alpert2009-10-291-78/+0
| | | | | | | | | | | | | | | | | | | | global object functions are now in globalobject.qdoc
| | | * | Merge QmlComponentJS into QmlComponentAlan Alpert2009-10-299-319/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createComponent() and Component{} are now the same, and so Component{}s can now be passed around for use in script. Also this commit fixes the minor bug QT-2386
| | * | | DocAlan Alpert2009-10-291-2/+2
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-28122-358/+817
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/globalobject.qdoc
| | * | | | Fill out QML global object documentationAlan Alpert2009-10-284-118/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the documentation for functions on the global object from qmlengine.cpp to globalobject.qdoc (so that qdoc actually generates them). The XmlHttpRequest documentation is still just a stub.
| | * | | | Minor cleanup of global objectAlan Alpert2009-10-282-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed desktopServices member, changed openUrl to openUrlExternally and placed it on the Qt object.
| * | | | | Store filename as a QUrl rather than convert to QString.Martin Jones2009-10-293-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Saves about 700KB heap in samegame.
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-2991-807/+21401
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Avoid unnecessary viewport scrolling when bringing currentItem into view.Martin Jones2009-10-292-10/+20
| | |_|_|/ | |/| | | | | | | | | | | | | Task-number: QT-2399
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: andreas
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into ↵Aaron Kennedy2009-10-2984-596/+2229
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | kinetic-declarativeui
| * | | | Fix warning in qvariant.h header + make sure QVariant in QVariant works as ↵Olivier Goffart2009-10-282-27/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected Also add more test Reviewed-by: Thierry
| * | | | Fixed bug in QTableView spans.Gabriel de Dietrich2009-10-283-2/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the spans internal structure was left in an inconsistent state. Auto-test included. Bonus: spans consistency checking method. Task-number: QTBUG-5062 Reviewed-by: Olivier
| * | | | Fixed missing repaints on QTreeView when moving the mouseThierry Bastian2009-10-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..from the decoration to the item itself. QAbstractItemView can't handle that because it doesn't know anything about decoration. Reviewed-by: gabi
| * | | | Extand test of qBinaryFindOlivier Goffart2009-10-281-1/+16
| | | | |
| * | | | Use qLowerBound in qBinaryFindPascal Létourneau2009-10-281-32/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of qBinaryFind use 64bit arithmetics even on a 32bit system, which make it slow The docs mention qBinaryFind will find any occurence of the search value not necessarily the first one, but this is not case with current implementation So nothing prevents the use of qLowerBound Reviewed-by: Olivier Goffart Merge-request: 1513