Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed parsing of inner labelled statements. | Roberto Raggi | 2010-04-16 | 3 | -7/+7 |
| | | | | | | | | | | | | | | | | | The JS grammar is ambigious and the following statement can be parsed as an object-literal followed by an inserted semicolon or as two labelled statements. outer: { inner: {} } In the old days we used to resolve the conflict by reducing the statement to an expression statement but this was wrong so now we prefer the labelled statement. As nice side effect, we pass two more tests in tests/auto/declarative/parserstress. Task-number: QTBUG-8108 | ||||
* | Doc | Aaron Kennedy | 2010-04-16 | 1 | -2/+2 |
| | |||||
* | Remove unsupported plugin version flags in .pro files of declarative examples | Joona Petrell | 2010-04-16 | 2 | -2/+0 |
| | | | | | Task-number: QTBUG-9191 Reviewed-by: Martin Jones | ||||
* | Documentation typo. | Yann Bodson | 2010-04-16 | 1 | -8/+8 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-16 | 2 | -2/+3 |
|\ | |||||
| * | Ensure existing image is gone before next photo selection. | Warwick Allison | 2010-04-16 | 1 | -0/+1 |
| | | | | | | | | Task-number: QTBUG-8084 | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-16 | 52 | -538/+836 |
| |\ | |||||
| * | | Don't use zoomfactor. | Warwick Allison | 2010-04-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | It gives better resolution for text positioning, btu many web sites don't work well with it and WebKit. | ||||
* | | | More QML doc consistency. | Martin Jones | 2010-04-16 | 4 | -22/+22 |
| |/ |/| | |||||
* | | Doc: in QML use "real" and "enumeration", not "qreal" and "enum" | Martin Jones | 2010-04-16 | 12 | -28/+23 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-16 | 43 | -592/+930 |
|\ \ | |||||
| * | | Wait for debug clients asynchronously instead of blocking creation of | Bea Lam | 2010-04-16 | 8 | -311/+143 |
| | | | | | | | | | | | | | | | | | | the engine until a debug client has connected. This makes for easier debugging from Qt Creator when debugging C++ and QML together and when debugging an application that has multiple engines. | ||||
| * | | Test not reliable | Bea Lam | 2010-04-16 | 1 | -8/+0 |
| | | | |||||
| * | | ResizeMode support for QGraphicsWidgets created with QDeclarativeView | Joona Petrell | 2010-04-16 | 10 | -132/+551 |
| | | | | | | | | | | | | | | | Task-number: QTBUG-8814 Reviewed-by: alexis | ||||
| * | | More class documentation fixes for declarative. | Michael Brasser | 2010-04-16 | 7 | -32/+77 |
| | | | |||||
| * | | Simplify QML import plugin deployment lines | Joona Petrell | 2010-04-16 | 5 | -10/+5 |
| | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones | ||||
| * | | Add QML imports to s60installs.pro | Joona Petrell | 2010-04-16 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | Task-number: QTBUG-9784 Reviewed-by: Martin Jones | ||||
| * | | Cleanup photoviewer demo. | Yann Bodson | 2010-04-16 | 3 | -4/+6 |
| |/ | |||||
| * | clean up | Warwick Allison | 2010-04-16 | 1 | -1/+0 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-16 | 9 | -11/+60 |
| |\ | |||||
| * | | Throw exceptions on programming errors for global functions. | Warwick Allison | 2010-04-16 | 9 | -94/+129 |
| | | | | | | | | | | | | Task-number: QTBUG-7897 | ||||
* | | | Doc: Put "default" property label on same line as property name | Martin Jones | 2010-04-16 | 2 | -10/+9 |
| | | | | | | | | | | | | Task-number: QTBUG-6336 | ||||
* | | | Doc: make note about using clip: true in views slightly more prominent. | Martin Jones | 2010-04-16 | 3 | -3/+3 |
| |/ |/| | |||||
* | | Add test for QTBUG-9949 | Martin Jones | 2010-04-16 | 1 | -0/+17 |
| | | | | | | | | Task-number: QTBUG-9949 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-16 | 1 | -3/+3 |
|\ \ | |||||
| * | | Do not set a font pixel size of 0. | Yann Bodson | 2010-04-16 | 1 | -3/+3 |
| | | | |||||
* | | | Add parent property to Timer | Martin Jones | 2010-04-16 | 1 | -0/+1 |
|/ / | | | | | | | Task-number: QTBUG-9949 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-16 | 9 | -26/+72 |
|\ \ | |||||
| * | | Cleanup | Aaron Kennedy | 2010-04-16 | 2 | -3/+3 |
| |/ | |||||
| * | Class documentation fixes for declarative. | Michael Brasser | 2010-04-16 | 5 | -18/+62 |
| | | |||||
| * | Correctly support translation in QDeclarativePixmapCache | Warwick Allison | 2010-04-16 | 2 | -5/+7 |
| | | |||||
* | | Avoid calling QGraphicsItem::setTransformOriginPoint() until needed | Martin Jones | 2010-04-16 | 4 | -5/+36 |
|/ | | | | | Task-number: QTBUG-9772 Reviewed-by: Alexis | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-16 | 102 | -722/+1366 |
|\ | |||||
| * | Correctly support translation in QDeclarativeCompiler | Aaron Kennedy | 2010-04-15 | 2 | -8/+2 |
| | | | | | | | | Reviewed-by: Friedemann Kleint | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-15 | 144 | -2302/+1724 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Small calculator fix. Improve declarative calculator example. Update examples autotest to use the runtime directly Support valuetypes as method return values Compile without Qt3 support. Doc Simplify dynamic resource loading to avoid cluttering Text API. Add Component.onDestruction attached property Use qmlInfo for image loading errors, not qWarning(). Visual test updates. Rename section so that it's not linked to by references to "JavaScript" Doc improvements Comments Remove unused parameter Correctly resolve, and load, IMG tags in Text element. Rename "sql" test so autotester doesn't get confused. Should work now, don't skip. ignore autotester logs Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData Rename QDeclarativeData -> QAbstractDeclarativeData ... | ||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-15 | 144 | -2302/+1724 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Small calculator fix. Improve declarative calculator example. Update examples autotest to use the runtime directly Support valuetypes as method return values Compile without Qt3 support. Doc Simplify dynamic resource loading to avoid cluttering Text API. Add Component.onDestruction attached property Use qmlInfo for image loading errors, not qWarning(). Visual test updates. Rename section so that it's not linked to by references to "JavaScript" Doc improvements Comments Remove unused parameter Correctly resolve, and load, IMG tags in Text element. Rename "sql" test so autotester doesn't get confused. Should work now, don't skip. ignore autotester logs Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData Rename QDeclarativeData -> QAbstractDeclarativeData ... | ||||
| | | * | Small calculator fix. | Yann Bodson | 2010-04-15 | 2 | -10/+10 |
| | | | | |||||
| | | * | Improve declarative calculator example. | Yann Bodson | 2010-04-15 | 13 | -227/+238 |
| | | | | |||||
| | | * | Update examples autotest to use the runtime directly | Aaron Kennedy | 2010-04-15 | 4 | -96/+42 |
| | | | | | | | | | | | | | | | | This improves the test execution time | ||||
| | | * | Support valuetypes as method return values | Aaron Kennedy | 2010-04-15 | 9 | -41/+133 |
| | | | | | | | | | | | | | | | | QTBUG-9818 | ||||
| | | * | Compile without Qt3 support. | Yann Bodson | 2010-04-15 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-15 | 1 | -0/+20 |
| | | |\ | |||||
| | | | * | Doc | Aaron Kennedy | 2010-04-15 | 1 | -0/+20 |
| | | | | | |||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-15 | 18 | -104/+178 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-15 | 56 | -1467/+327 |
| | | | |\ | |||||
| | | | * | | Add Component.onDestruction attached property | Aaron Kennedy | 2010-04-15 | 17 | -99/+171 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property complements Component.onCompleted. It is emitted before the destruction actually begins (for the most part) so the objects are still alive and accessible. The QtObject.onDestroyed signal is now blocked as it never really worked properly anyway. | ||||
| | | | * | | Comments | Aaron Kennedy | 2010-04-15 | 1 | -1/+3 |
| | | | | | | |||||
| | | | * | | Remove unused parameter | Aaron Kennedy | 2010-04-15 | 3 | -4/+4 |
| | | | | | | |||||
| | | * | | | Simplify dynamic resource loading to avoid cluttering Text API. | Warwick Allison | 2010-04-15 | 3 | -13/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9900 QT-3287 | ||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-15 | 24 | -1436/+130 |
| | | |\ \ \ | | | | | |/ | | | | |/| |