Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make compile following recent QDeclarativeProperty changes | Bea Lam | 2010-02-26 | 1 | -28/+28 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 22 | -267/+459 |
|\ | |||||
| * | Update test numbers after change to default transformOrigin. | Michael Brasser | 2010-02-25 | 1 | -6/+4 |
| * | Merge branch 'master' of git:qt/qt-qml | Thiago Macieira | 2010-02-25 | 1382 | -31126/+32572 |
| |\ | |||||
| | * | Introduced QDeclarativeExtensionPlugin::registerTypes(uri). | Roberto Raggi | 2010-02-25 | 4 | -8/+6 |
| | * | Rename QDeclarativeMetaProperty -> QDeclarativeProperty | Aaron Kennedy | 2010-02-25 | 9 | -203/+203 |
| | * | Document and test resetting properties in a state change. | Michael Brasser | 2010-02-25 | 2 | -0/+41 |
| | * | Make more private QDeclarativeMetaProperty methods private | Aaron Kennedy | 2010-02-25 | 2 | -12/+13 |
| * | | Better check in QStaticText testcase if xformed text is supported | Gunnar Sletta | 2010-02-25 | 1 | -5/+12 |
| * | | Merge remote branch 'origin/master' | Olivier Goffart | 2010-02-24 | 2 | -1/+14 |
| |\ \ | |||||
| * | | | Expand indicator would not be displayed after removal of a collapsed item's c... | Gabriel de Dietrich | 2010-02-24 | 1 | -0/+14 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Eskil Abrahamsen Blomfeldt | 2010-02-24 | 31 | -3/+4854 |
| |\ \ \ | |||||
| | * | | | Fixed a warning. | Trond Kjernåsen | 2010-02-24 | 1 | -1/+1 |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Rhys Weatherley | 2010-02-24 | 30 | -2/+4853 |
| | |\ \ \ | |||||
| * | | | | | Fix QStaticText test on QWS | Eskil Abrahamsen Blomfeldt | 2010-02-24 | 1 | -1/+29 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-23 | 5 | -50/+155 |
| |\ \ \ \ | |||||
| | * | | | | Skip complex FBO tests if combined depth-stencil isn't supported | Tom Cooksey | 2010-02-23 | 1 | -1/+16 |
| | * | | | | Make tst_QGL::glWidgetRendering use same test as FBO autotest | Tom Cooksey | 2010-02-23 | 1 | -39/+47 |
| | * | | | | Made the qDrawPixmaps() API public (with modifications). | Trond Kjernåsen | 2010-02-23 | 1 | -2/+46 |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-23 | 3 | -8/+46 |
| | |\ \ \ \ | |||||
| | | * | | | | QSortFilterProxyModel: Sorting occured unnecessarily when the dynamicSortFilt... | Olivier Goffart | 2010-02-22 | 1 | -4/+34 |
| | | * | | | | Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled. | Olivier Goffart | 2010-02-22 | 1 | -3/+11 |
| | | * | | | | Compile | Paul Olav Tvete | 2010-02-22 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 6 | -0/+269 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-25 | 8 | -89/+107 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | React to QAbstractItemModel::modelReset() signal. | Martin Jones | 2010-02-25 | 6 | -0/+269 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 2 | -18/+18 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Tweak QDeclarativeMetaProperty type category API | Aaron Kennedy | 2010-02-25 | 2 | -18/+18 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 49 | -82/+5013 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Remove QDeclarativeMetaProperty::createProperty() method | Aaron Kennedy | 2010-02-25 | 2 | -14/+14 |
| * | | | | | | | Add import Qt.widgets 4.6 to loader auto test using graphics widgets | Joona Petrell | 2010-02-25 | 1 | -0/+1 |
| * | | | | | | | Move private QDeclarativeMetaProperty functions into the private class | Aaron Kennedy | 2010-02-25 | 2 | -56/+59 |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-25 | 2 | -1/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 2 | -1/+14 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | QMediaContent test; make sure to use network. | Justin McPherson | 2010-02-24 | 1 | -1/+1 |
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 1 | -0/+13 |
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 1 | -0/+13 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 1 | -0/+13 |
| | | | | |\ \ \ | |||||
| | | | | | * | | | Added QNetworkRequest constructor to QMediaContent. | Nicholas Young | 2010-02-23 | 1 | -0/+13 |
| | | | | | | |/ | | | | | | |/| | |||||
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 13 | -3/+59 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Make QDeclarativeMetaType and QDeclarativeType private | Aaron Kennedy | 2010-02-24 | 3 | -3/+6 |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-24 | 9 | -1/+6 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fixup tests after QDeclarative class renames | Aaron Kennedy | 2010-02-24 | 4 | -1/+1 |
| | | * | | | | | | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 5 | -0/+5 |
| | * | | | | | | | Don't crash if the currentIndex is set while creating a delegate. | Martin Jones | 2010-02-24 | 2 | -0/+48 |
| | |/ / / / / / | |||||
| * | | | | | | | Uses Qt.widgets | Warwick Allison | 2010-02-24 | 1 | -0/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 5 | -6/+41 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add an "asynchonous" property to Image. | Martin Jones | 2010-02-24 | 2 | -6/+12 |
| * | | | | | | | Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779 | Warwick Allison | 2010-02-24 | 2 | -2/+2 |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 61 | -892/+892 |
| |\ \ \ \ \ \ \ |