Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git:qt/qt-qml | Thiago Macieira | 2010-02-25 | 28 | -162/+180 |
|\ | |||||
| * | Document Package | Martin Jones | 2010-02-25 | 1 | -0/+1 |
| * | Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView" | Aaron Kennedy | 2010-02-25 | 1 | -10/+0 |
| * | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView | Alan Alpert | 2010-02-24 | 1 | -0/+10 |
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt | Warwick Allison | 2010-02-24 | 2 | -0/+58 |
| |\ | |||||
| * | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec... | Warwick Allison | 2010-02-24 | 28 | -125/+125 |
| * | | doc | Warwick Allison | 2010-02-24 | 1 | -1/+1 |
| * | | doc | Warwick Allison | 2010-02-24 | 1 | -1/+1 |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 23 | -915/+522 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 23 | -915/+522 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 4 | -24/+13 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Adds QmlEasingValueType to qml | Leonardo Sobral Cunha | 2010-02-23 | 1 | -6/+6 |
| | * | | | Make QmlBinding (and friends) private | Aaron Kennedy | 2010-02-23 | 1 | -12/+0 |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 2 | -6/+37 |
| | |\ \ \ | |||||
| | | * | | | Doc. | Michael Brasser | 2010-02-23 | 1 | -6/+6 |
| | * | | | | Add support for setting the root index when using a QAbstractItemModel. | Martin Jones | 2010-02-23 | 1 | -0/+1 |
| * | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls. | Warwick Allison | 2010-02-23 | 2 | -21/+18 |
| | |/ / / | |/| | | | |||||
| * | | | | Add documentation on QMLs memory management assumptions | Aaron Kennedy | 2010-02-23 | 1 | -0/+31 |
| |/ / / | |||||
* | | | | Doc: fix formatting | aavit | 2010-02-24 | 1 | -22/+22 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-23 | 2 | -0/+58 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 66 | -1120/+2608 |
| |\ \ | |||||
| * | | | Use snippets. | Aaron McCarthy | 2010-02-15 | 1 | -0/+49 |
| * | | | Expand documentation for QNAM::setConfiguration() and friends. | Aaron McCarthy | 2010-02-15 | 1 | -0/+9 |
* | | | | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-23 | 16 | -34/+38 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Documentation Update | Alan Alpert | 2010-02-22 | 1 | -1/+5 |
| * | | | Doc fix | Alan Alpert | 2010-02-22 | 1 | -1/+1 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-22 | 18 | -35/+35 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Replace QmlList* and QList* support with a single QmlListProperty type | Aaron Kennedy | 2010-02-22 | 3 | -9/+9 |
| | * | | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 15 | -26/+26 |
* | | | | Merge branch 'master' of git:qt/qt | Thiago Macieira | 2010-02-21 | 41 | -80/+125 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-20 | 1 | -40/+85 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-20 | 1 | -40/+85 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Merge branch 'rtiff392' | aavit | 2010-02-20 | 1 | -39/+78 |
| | | |\ \ | |||||
| | | | * | | license doc updated for libtiff 3.9.2 | aavit | 2010-02-16 | 1 | -39/+78 |
| | | * | | | Merge branch 'rjpeg8' | aavit | 2010-02-20 | 1 | -7/+13 |
| | | |\ \ \ | |||||
| | | | * | | | Update license doc, .pro file and qjpeghandler for libjpeg 8 | aavit | 2010-02-16 | 1 | -7/+13 |
| * | | | | | | Doc: these files are NOT part of the test suite of the Qt toolkit | Thiago Macieira | 2010-02-20 | 46 | -46/+46 |
| * | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 10 | -53/+145 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-18 | 56 | -1059/+2410 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | doc: Fixed several typos. | Martin Smith | 2010-02-12 | 1 | -1/+1 |
* | | | | | | | | | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-20 | 10 | -53/+145 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-19 | 9 | -52/+104 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | doc | Warwick Allison | 2010-02-19 | 1 | -2/+5 |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 56 | -1059/+2410 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | * | | | | | | | Doc: reformulate why we build a button | Henrik Hartz | 2010-02-18 | 1 | -2/+3 |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-18 | 2 | -46/+44 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Get rid of the matchProperties/properties distinction, as it | Michael Brasser | 2010-02-18 | 2 | -46/+44 |
| | * | | | | | | | | QmlView API review. See QmlChanges.txt for details. | Martin Jones | 2010-02-18 | 1 | -0/+9 |
| | |/ / / / / / / |