Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-11 | 2 | -0/+0 |
|\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/util.pri | ||||
| * | Remove huge unused animated images. | Warwick Allison | 2009-11-11 | 2 | -0/+0 |
| | | |||||
* | | Update SameGame tutorial to discuss offline storage | Alan Alpert | 2009-11-11 | 5 | -19/+27 |
|/ | | | | | | Also removed the \target and got the navigation set up properly. Task-number: QT-2375 | ||||
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-09 | 33 | -265/+1478 |
|\ | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h | ||||
| * | Mistake in the example for QByteArray::lastIndexOf() | Keith Isdale | 2009-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Correct typing error "azy" -> "az" Ensure that the example code returns indicated values. Task-number: QTBUG-5571 Reviewed-by: Peter Yard | ||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6 | David Boddie | 2009-11-06 | 3 | -33/+68 |
| |\ | |||||
| | * | Doc: Fixed a URL to ensure that it can be used in well-formed XML. | David Boddie | 2009-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | Doc: Moved external references to a separate collection. | David Boddie | 2009-11-06 | 2 | -32/+67 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | Doc: Trivial fix. | David Boddie | 2009-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | update documentation | Lars Knoll | 2009-11-06 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | We are at Unicode 5.1, not 4.0 Tell about N'Ko support. Reviewed-by: Gunnar | ||||
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-06 | 21 | -164/+1201 |
| |\ \ | | |/ | |||||
| | * | Doc: Fixed qdoc warnings. | David Boddie | 2009-11-05 | 5 | -24/+34 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6 | David Boddie | 2009-11-05 | 1 | -2/+4 |
| | |\ | |||||
| | | * | Doc: Added a link to the online version of the Qt book (2nd edition). | David Boddie | 2009-11-05 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | Documentation: Updating Embedded HW acc. docs | Morten Engvoldsen | 2009-11-05 | 1 | -230/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Removing redundant file Task-number: QT-1109 | ||||
| | * | | Documentation: Embedded hardware acceleration | Morten Engvoldsen | 2009-11-05 | 14 | -44/+1299 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding docs on how to use hardware acceleration on Embedded Linux and Windows CE Task-number: QT-1109 Rev-by: Anders Bakken Rev-by: Rhys Weatherley Rev-by: Thomas Hartmann | ||||
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6 | David Boddie | 2009-11-04 | 2 | -6/+6 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/gui/kernel/qgesture.cpp | ||||
| | | * | Doc: Fixed qdoc warnings. | David Boddie | 2009-11-04 | 3 | -9/+9 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | Modify QGLShader and QGLShaderProgram in response to API review | Rhys Weatherley | 2009-11-05 | 1 | -6/+9 |
| |/ / | | | | | | | | | | Reviewed-by: Sarah Smith | ||||
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-11-04 | 8 | -91/+112 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge commit '51c9b68' into 4.6 | Morten Johan Sørvig | 2009-11-04 | 1 | -9/+9 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h | ||||
| | | * | Gesture api review. | Denis Dzyubenko | 2009-11-03 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette | ||||
| | | * | Documentation fixes related to gestures doc. | Denis Dzyubenko | 2009-11-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-04 | 10 | -358/+313 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Jason McDonald | 2009-11-04 | 7 | -355/+310 |
| | | |\ \ | |||||
| | | * | | | Attempt to fix qdoc error caused by renaming of ftp example to qftp. | Jason McDonald | 2009-11-04 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | Merge branch 'statemachine-api-changes' into 4.6 | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 3 | -10/+11 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/statemachine.qdoc src/corelib/statemachine/qstatemachine.cpp | ||||
| | | * | | | | Rename QState::polished() signal to "propertiesAssigned" | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 3 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Polished" was never a very descriptive word, and it already has a meaning attached in the QStyle API. Additionally, "propertiesAssigned" has the benefit of giving the relation to the assignProperty() function as part of the name. Reviewed-by: Kent Hansen | ||||
| | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-03 | 1 | -0/+23 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Embed code examples in state machine overview | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 1 | -13/+6 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you put \snippet inside \code tags, it's interpreted as code, not as a tag. Reviewed-by: Trust me | ||||
| | * | | | | doc: Polish documentation for state machine framework | Eskil Abrahamsen Blomfeldt | 2009-11-03 | 3 | -66/+93 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some examples and wording, and add some clarification based on comments in documentation review session. Reviewed-by: Kent Hansen | ||||
| * | | | | Doc: Added in-progress documentation for the Image Gestures example. | David Boddie | 2009-11-03 | 1 | -0/+116 |
| | |_|/ | |/| | | | | | | | | | | Reviewed-by: Trust Me | ||||
* | | | | Fix doc link. | Martin Jones | 2009-11-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Doc | Martin Jones | 2009-11-09 | 1 | -0/+1 |
| | | | | |||||
* | | | | Doc. | Michael Brasser | 2009-11-06 | 1 | -3/+0 |
| | | | | |||||
* | | | | Update animation docs. | Michael Brasser | 2009-11-06 | 1 | -14/+62 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-11-06 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Test Keys and KeyNavigation attached props. Fix Keys on<Key>Pressed | Martin Jones | 2009-11-06 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Rename targets -> matchTargets and properties -> matchProperties. | Michael Brasser | 2009-11-06 | 2 | -7/+7 |
|/ / / / | |||||
* | | | | Document the vector3d type in QML | Rhys Weatherley | 2009-11-05 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5334 Reviewed-by: Aaron Kennedy | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-05 | 1 | -5/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Remove "to" limit on minor version. | Warwick Allison | 2009-11-05 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421 | ||||
* | | | | | Particles cleaned up and placed in in qmlgraphics/ | Alan Alpert | 2009-11-05 | 1 | -3/+3 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-04 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Add closestAngle function to Qt object to help with rotation animations. | Alan Alpert | 2009-11-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Includes test and doc. | ||||
* | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-04 | 7 | -355/+333 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | 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 | 7 | -355/+310 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp | ||||
| | * | | Doc: Added links to the SQL documentation and corrected license info. | David Boddie | 2009-11-03 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | Doc: Added a note about QApplication::installTranslator(). | David Boddie | 2009-11-02 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale | ||||
| | * | | Doc: i18n overhaul for QObject::tr() and the Qt Linguist manual. | David Boddie | 2009-11-02 | 4 | -350/+290 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me |