Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix parenting after 6f88388db4e8e202780d789e66664ff824691948. | Michael Brasser | 2010-03-30 | 8 | -35/+31 |
| | |||||
* | Fix viewer resizing on reload and File->open | Martin Jones | 2010-03-30 | 1 | -0/+1 |
| | | | | Task-number: QTBUG-9325 | ||||
* | Don't emit onPositionChanged before onPressed | Martin Jones | 2010-03-30 | 1 | -1/+0 |
| | | | | Task-number: QTBUG-9383 | ||||
* | Make QDeclarativeListProperty a class | Aaron Kennedy | 2010-03-30 | 1 | -1/+2 |
| | | | | Apparently structs are not socially acceptable. | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-30 | 9 | -75/+56 |
|\ | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp | ||||
| * | Correctly parent repeater items. | Michael Brasser | 2010-03-30 | 1 | -5/+5 |
| | | |||||
| * | Make sure cursor delegate is parented. | Michael Brasser | 2010-03-29 | 2 | -0/+4 |
| | | | | | | | | setParentItem no longer sets QObject parent. | ||||
| * | Allow just one dimension to be set, the other scaled accordingly | Warwick Allison | 2010-03-29 | 1 | -3/+11 |
| | | | | | | | | Task-number: QTBUG-8984 | ||||
| * | Simplify import path. | Warwick Allison | 2010-03-29 | 3 | -57/+36 |
| | | | | | | | | Reviewed-by: mae | ||||
| * | Removed unneeded code. | Roberto Raggi | 2010-03-29 | 2 | -10/+0 |
| | | |||||
* | | Fix qdeclarativedom::loadDynamicProperty test | Aaron Kennedy | 2010-03-30 | 1 | -0/+6 |
|/ | |||||
* | Improve QML compiler statistics | Aaron Kennedy | 2010-03-29 | 2 | -9/+45 |
| | |||||
* | Use error enum not numbers | Warwick Allison | 2010-03-29 | 1 | -2/+2 |
| | | | | (easier to doc) | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 1 | -4/+0 |
|\ | |||||
| * | QDeclarativeItem::setParentItem should not modify the QObject parent | Aaron Kennedy | 2010-03-29 | 1 | -4/+0 |
| | | | | | | | | QTBUG-5768 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 1 | -45/+40 |
|\ \ | |/ | |||||
| * | Doc | Aaron Kennedy | 2010-03-29 | 1 | -45/+40 |
| | | | | | | | | QTBUG-7998 | ||||
* | | Ensure currentIndex is updated when PathView items are removed/moved | Martin Jones | 2010-03-29 | 2 | -8/+37 |
|/ | |||||
* | Relayout items when Flow size changes. | Martin Jones | 2010-03-29 | 1 | -0/+3 |
| | | | | | | Also add Flow tests. Task-number: QTBUG-9421 | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 13 | -73/+527 |
|\ | |||||
| * | Optimization: reduce allocations | Aaron Kennedy | 2010-03-29 | 2 | -4/+4 |
| | | |||||
| * | Remove "variant" QML properties | Aaron Kennedy | 2010-03-29 | 1 | -2/+1 |
| | | | | | | | | "property var a" works just as well | ||||
| * | Use QDateTime when specifying a "date" property in QML | Aaron Kennedy | 2010-03-29 | 5 | -4/+43 |
| | | | | | | | | QT-718 | ||||
| * | Fix for qdeclarativelanguage::listProperties | Aaron Kennedy | 2010-03-29 | 1 | -2/+5 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 2 | -6/+9 |
| |\ | |||||
| | * | Fix crash in QDeclarativePropertyMap. | Michael Brasser | 2010-03-29 | 2 | -6/+9 |
| | | | | | | | | | | | | Task-number: QTBUG-9439 | ||||
| * | | Remove total wrongness. | Warwick Allison | 2010-03-29 | 1 | -1/+0 |
| |/ | | | | | | | Base URL of engine is not what some people think it is. | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 7 | -47/+443 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-29 | 5 | -18/+27 |
| | |\ | |||||
| | | * | Fix memory leak and clean up deletion. | Bea Lam | 2010-03-29 | 1 | -8/+5 |
| | | | | |||||
| | | * | Don't emit QDeclarativePropertyMap::valueChanged() before the value has | Michael Brasser | 2010-03-29 | 4 | -10/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | changed. Task-number: QTBUG-9386 | ||||
| | * | | Optimization: Don't use QVariant in QDeclarativeVMEMetaObject | Aaron Kennedy | 2010-03-29 | 2 | -29/+416 |
| | |/ | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 4 | -83/+105 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/examples.qdoc doc/src/declarative/focus.qdoc doc/src/declarative/modules.qdoc doc/src/declarative/network.qdoc doc/src/declarative/qdeclarativedebugging.qdoc doc/src/declarative/qdeclarativei18n.qdoc doc/src/declarative/qmlruntime.qdoc doc/src/declarative/tutorial.qdoc tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | ||||
| * | | Add importPathList, mainly for doc purposes. | Warwick Allison | 2010-03-29 | 2 | -10/+25 |
| | | | |||||
* | | | Make sure the image reader thread is shutdown properly | Martin Jones | 2010-03-29 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | Prevents deadlock on shutdown for very shortlived runs, e.g. autotests | ||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 4 | -83/+105 |
|\ \ \ | | |/ | |/| | |||||
| * | | Cleanup. | Michael Brasser | 2010-03-28 | 2 | -30/+8 |
| | | | |||||
| * | | Don't set status to Ready until model has been created (currently this | Bea Lam | 2010-03-28 | 2 | -53/+97 |
| |/ | | | | | | | | | | | | | | | | | | | is set as soon as XML data is downloaded, so there is no notification when model is actually ready to be used). This also fixes data() to not crash if it is called before the model is ready. Task-number: QTBUG-7835 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-28 | 11 | -20/+54 |
|\ \ | |/ | |||||
| * | Source resizing for QDeclarativeImageProvider too. | Warwick Allison | 2010-03-28 | 5 | -6/+12 |
| | | | | | | | | (fixes test too) | ||||
| * | tyop | Warwick Allison | 2010-03-28 | 1 | -1/+1 |
| | | |||||
| * | Recompute the source location of regexp literals. | Roberto Raggi | 2010-03-26 | 2 | -2/+14 |
| | | | | | | | | Task-number: QTBUG-9367 | ||||
| * | Adds a way to clear the state list property in QDeclarativeStateGroup | Kai Koehne | 2010-03-26 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | Needed by QmlDesigner, which needs to be able to remove states at runtime. Done my Marco Bubke Reviewed-by: Michael Brasser | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-03-26 | 4 | -57/+281 |
| |\ | |||||
| * | | I've been told this fixes compilation on windows. | Alan Alpert | 2010-03-26 | 1 | -1/+1 |
| | | | |||||
| * | | Doc Augmentation | Alan Alpert | 2010-03-26 | 1 | -1/+3 |
| | | | | | | | | | | | | Task-number: QTBUG-9396 | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-03-26 | 29 | -340/+784 |
| |\ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-03-25 | 49 | -878/+1471 |
| |\ \ \ | |||||
| * | | | | Forgot to add a file. | Alan Alpert | 2010-03-25 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to add these, the primary changes, to commit 870dbc7542beb07b84378f356cbe568a2ae8b7e1 | ||||
* | | | | | Fix change description: Import -> import | Martin Jones | 2010-03-28 | 1 | -1/+1 |
| |_|_|/ |/| | | |