Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵ | Warwick Allison | 2010-02-24 | 1349 | -31180/+31183 |
| | | | | QDeclarativeXXX. | ||||
* | Fix positioner auto test with new easing curve syntax | Joona Petrell | 2010-02-24 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 9 | -6/+59 |
|\ | | | | | | | | | Conflicts: src/declarative/qml/qml.h | ||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-24 | 8 | -2/+161 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 5 | -2/+55 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp | ||||
| | | * | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-23 | 83 | -843/+788 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp | ||||
| | | | * | Merge branch 'qt-master-from-4.6' of ↵ | Qt Continuous Integration System | 2010-02-23 | 2 | -1/+15 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Don't process uic3 subdir if qt3support is disabled. Fixed failure of tst_symbols when Qt is configured with -qtnamespace | ||||
| | | | | * | Merge remote branch 'origin/4.6' into integration-master-from-4.6 | Rohan McGovern | 2010-02-22 | 2 | -1/+15 |
| | | | | |\ | |||||
| | | | | | * | Don't process uic3 subdir if qt3support is disabled. | Rohan McGovern | 2010-02-22 | 1 | -1/+3 |
| | | | | | | | |||||
| | | | | | * | Fixed failure of tst_symbols when Qt is configured with -qtnamespace | Rohan McGovern | 2010-02-22 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklist some symbols which cannot be namespaced when Qt is configured in a namespace. | ||||
| | | * | | | | Use QTRY_COMPARE to give the animation a chance to finish | Kent Hansen | 2010-02-23 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using duration + 100 ms is apparently not sufficient. | ||||
| | | * | | | | Added function overload for QByteArray &QByteArray::replace() | Zeno Albisser | 2010-02-23 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This overloaded function can be used to replace a specific portion of a QByteArray with an arbitary amount of characters from a char[]. Reviewed-by: Markus Goetz | ||||
| | | * | | | | QNativeSocketEngine: Fix some error handling related to waitFor*() | Markus Goetz | 2010-02-22 | 1 | -0/+25 |
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7054 Reviewed-by: Peter Hartmann | ||||
| * | | | | | Fix expected errors following d43ec1bdb12649c32f0f0067492857a70bef05b4 | Bea Lam | 2010-02-24 | 3 | -3/+3 |
| | | | | | | |||||
| * | | | | | Disallow ids that start with upper case letters. | Bea Lam | 2010-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2786 | ||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 3 | -0/+106 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 1 | -0/+13 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 32 | -119/+706 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix illegal access in QmlStyledText and add auto tests | Martin Jones | 2010-02-23 | 3 | -0/+106 |
| | | | | | | | |||||
* | | | | | | | Compile after 20fc9f2e264f34dd8580949ddbe5511b78ab0ac4 | Warwick Allison | 2010-02-23 | 1 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-23 | 42 | -260/+786 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Missing test data file. | Bea Lam | 2010-02-23 | 1 | -0/+13 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 46 | -267/+1049 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp | ||||
| * | | | | | | Fixing deployment and default values for Symbian | Aleksandar Sasha Babic | 2010-02-23 | 2 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| * | | | | | | Fixing deplyment on Symbian platform | Aleksandar Sasha Babic | 2010-02-23 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| * | | | | | | Fixing deployment on Symbian | Aleksandar Sasha Babic | 2010-02-23 | 2 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| * | | | | | | Fixing deployment on Symbian | Aleksandar Sasha Babic | 2010-02-23 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| * | | | | | | Fixing deployment on Symbian platform | Aleksandar Sasha Babic | 2010-02-23 | 2 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| * | | | | | | Fixing deployment on Symbian | Aleksandar Sasha Babic | 2010-02-23 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| * | | | | | | String to enum conversion in value types | Aaron Kennedy | 2010-02-23 | 3 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning a string to a value type enum property from a binding was not working as QmlMetaProperty didn't realise the property was of enum type. | ||||
| * | | | | | | Updates all qml examples/demos to use the easing curve value type syntax | Leonardo Sobral Cunha | 2010-02-23 | 11 | -61/+61 |
| | | | | | | | |||||
| * | | | | | | Adds QmlEasingValueType to qml | Leonardo Sobral Cunha | 2010-02-23 | 1 | -52/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it's possible to use easing curve types directly in qml as value types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the former ugly string format, like "easeOutBounce(amplitude:3.0)". Reviewed-by: akennedy | ||||
| * | | | | | | Add QEasingCurve as builtin metatype | Leonardo Sobral Cunha | 2010-02-23 | 1 | -0/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for qml, in order to be able to use easing as a valuetype. Task-number: QTBUG-8235 Reviewed-by: thierry Reviewed-by: janarve | ||||
| * | | | | | | Add missing NOTIFY signals to positioners, particles and webview | Joona Petrell | 2010-02-23 | 6 | -1/+360 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy | ||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 6 | -7/+263 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-23 | 5 | -7/+9 |
| | |\ \ \ \ | |||||
| | | * | | | | QmlExpression API review | Aaron Kennedy | 2010-02-23 | 3 | -5/+7 |
| | | | | | | | |||||
| | | * | | | | Make QmlBinding (and friends) private | Aaron Kennedy | 2010-02-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlBinding exposes way too many implementation details to be confident about making it public right now. | ||||
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-23 | 552 | -2005/+33685 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | * | | | | | Add XmlRole::isKey property for incremental data changes when reload() | Bea Lam | 2010-02-23 | 1 | -0/+254 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is called. Task-number: QT-2831 | ||||
| * | | | | | | Remove QmlView::execute(). QmlView::setSource() does it all now. | Martin Jones | 2010-02-23 | 13 | -141/+80 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Task-number: QT-2538 | ||||
* | | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls. | Warwick Allison | 2010-02-23 | 26 | -48/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2798 | ||||
* | | | | | | Make executable outside dir. | Warwick Allison | 2010-02-23 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 7 | -34/+77 |
|\ \ \ \ \ | |||||
| * | | | | | Fix but in QmlMetaProperty assignment operator | Aaron Kennedy | 2010-02-23 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-8166 | ||||
| * | | | | | Cleanup warnings in qmlmetaproperty test | Aaron Kennedy | 2010-02-23 | 1 | -11/+11 |
| | | | | | | |||||
| * | | | | | Rename qmllist autotest to qmllistreference | Aaron Kennedy | 2010-02-23 | 6 | -23/+23 |
| | | | | | | |||||
* | | | | | | Work. | Warwick Allison | 2010-02-23 | 1 | -0/+5 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 373 | -1354/+20029 |
|\ \ \ \ \ | | |_|/ / | |/| | | |