Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix javascript errors in samegame tutorials | Yann Bodson | 2009-11-05 | 4 | -57/+102 |
| | |||||
* | Use darker() and lighter() functions from global Qt object rather than from ↵ | Yann Bodson | 2009-11-05 | 11 | -12/+12 |
| | | | | SystemPalette. | ||||
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-05 | 1 | -6/+7 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 21 | -28/+28 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Particles cleaned up and placed in in qmlgraphics/ | Alan Alpert | 2009-11-05 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API changes: Removed bool streamIn Added int emissionRate Added int emissionVariance Added void burst(count, emissionRate=-1) While rewriting the internals to accomodate this, all other outstanding particles bugs were believed fixed. Task-number: QT-2392 QT-2391 QT-2390 QT-2406 | ||||
* | | | use FreeMono.ttf | Yann Bodson | 2009-11-05 | 3 | -2/+1 |
| |/ |/| | |||||
* | | Remove "to" limit on minor version. | Warwick Allison | 2009-11-05 | 21 | -28/+28 |
|/ | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421 | ||||
* | Remove examples of removed effects. | Warwick Allison | 2009-11-04 | 1 | -63/+12 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 1 | -4/+1 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | more autotests | Yann Bodson | 2009-11-04 | 1 | -4/+1 |
| | | |||||
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-04 | 3 | -15/+6 |
|\ \ | |/ |/| | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h | ||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6 | David Boddie | 2009-11-03 | 2 | -1/+3 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp | ||||
| | * | Fixed main window closing when subwindows cancel their close events. | David Boddie | 2009-11-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Reported-here: http://lists.trolltech.com/pipermail/qt4-preview-feedback /2009-October/001023.html | ||||
| | * | Doc: i18n overhaul for QObject::tr() and the Qt Linguist manual. | David Boddie | 2009-11-02 | 1 | -0/+2 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | Add QScriptString::toArrayIndex() function | Kent Hansen | 2009-10-30 | 1 | -14/+3 |
| |/ | | | | | | | | | | | | | | | | | | | Avoid hacking a custom toArrayIndex() in the example; instead provide an ECMA-compliant conversion that's as fast as possible (having to convert the QScriptString to a QString and then convert the result to a number is considerably slower than calling JSC's Identifier::toArrayIndex() function directly). Reviewed-by: Olivier Goffart | ||||
* | | * add more font examples | Yann Bodson | 2009-11-03 | 3 | -26/+75 |
| | | | | | | | | * add missing properties to QmlFontValueType | ||||
* | | move smooth example in visual tests | Yann Bodson | 2009-11-02 | 3 | -110/+0 |
| | | |||||
* | | add night support for clocks example | Yann Bodson | 2009-11-02 | 3 | -1/+4 |
| | | |||||
* | | enable smooth scaling for dynamic example | Yann Bodson | 2009-10-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-10-30 | 21 | -17/+817 |
|\ \ | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | fix headers | Warwick Allison | 2009-10-30 | 21 | -17/+817 |
| | | | |||||
* | | | add missing image | Yann Bodson | 2009-10-30 | 1 | -0/+0 |
| | | | |||||
* | | | cleanup | Yann Bodson | 2009-10-30 | 10 | -10/+10 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-10-30 | 32 | -17/+1257 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: examples/declarative/dial/main.cpp | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-30 | 34 | -141/+123 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 headers | Warwick Allison | 2009-10-29 | 33 | -17/+1297 |
| | | | | |||||
* | | | | cleanup dial example | Yann Bodson | 2009-10-30 | 9 | -50/+15 |
| | | | | |||||
* | | | | cleanup | Yann Bodson | 2009-10-30 | 3 | -2/+3 |
| | | | | |||||
* | | | | small fixes to parallax example | Yann Bodson | 2009-10-30 | 2 | -27/+12 |
| | | | | |||||
* | | | | fix parallax example | Yann Bodson | 2009-10-30 | 2 | -7/+5 |
| |/ / |/| | | |||||
* | | | change cities in clock example | Yann Bodson | 2009-10-30 | 2 | -5/+5 |
| | | | |||||
* | | | cleanup | Yann Bodson | 2009-10-30 | 12 | -12/+15 |
| | | | |||||
* | | | cleanup | Yann Bodson | 2009-10-30 | 16 | -41/+12 |
| | | | |||||
* | | | improve clock example | Yann Bodson | 2009-10-30 | 7 | -37/+41 |
| | | | |||||
* | | | Merge QmlComponentJS into QmlComponent | Alan Alpert | 2009-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 1 | -0/+4 |
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp src/script/api/qscriptprogram.cpp src/script/api/qscriptprogram.h src/script/api/qscriptprogram_p.h tests/auto/qscriptengine/tst_qscriptengine.cpp tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp tools/qdoc3/test/qt-inc.qdocconf | ||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | axis | 2009-10-27 | 3 | -8/+145 |
| |\ | |||||
| * | | Emulator IAP fix for Symbian | Janne Koskinen | 2009-10-26 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | Don't display multiple useless IAP dialogs in the emulator environment. If you need specific IAP then you need to revert this commit. Reviewed-by: Aleksandar Babic | ||||
* | | | Update viewport size when items are added/removed/resized. | Martin Jones | 2009-10-28 | 1 | -0/+22 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-28 | 51 | -4146/+15 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Remove QML SQL classes | Aaron Kennedy | 2009-10-28 | 49 | -4143/+0 |
| | | | | | | | | | | | | | | | | | | | | Sadly, these are not being maintained. There's still SQL offline storage for all your SQL needs. | ||||
| * | | | Incorporate latest optical theory. | Warwick Allison | 2009-10-28 | 2 | -3/+15 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-28 | 20 | -137/+101 |
|\ \ \ \ | |/ / / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-28 | 19 | -135/+101 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Use a nicer face image | Aaron Kennedy | 2009-10-28 | 8 | -0/+7 |
| | | | | | |||||
| | * | | | cleanup | Yann Bodson | 2009-10-28 | 10 | -15/+15 |
| | | | | | |||||
| | * | | | cleanup | Yann Bodson | 2009-10-28 | 3 | -120/+79 |
| | | | | | |||||
| * | | | | Fix dynamic example | Alan Alpert | 2009-10-28 | 1 | -2/+0 |
| |/ / / | | | | | | | | | | | | | | | | | Includes adding a comment to the positioners to alert others that you shouldn't use anchors as well. | ||||
* | | | | Improve feel of flicking itemlist demo pages. | Martin Jones | 2009-10-28 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |