Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-04 | 30 | -208/+83 |
|\ | | | | | | | | | Conflicts: src/src.pro | ||||
| * | Fix namespace qml decleration. | Justin McPherson | 2010-03-04 | 1 | -2/+1 |
| | | | | | | | | Reviewed-by: Andrew den Exter | ||||
| * | Cocoa namespace fixes. | Justin McPherson | 2010-03-04 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Rohan McGovern | ||||
| * | Namespace fixes. | Justin McPherson | 2010-03-04 | 1 | -3/+4 |
| | | | | | | | | Reviewed-by: Rohan McGovern | ||||
| * | QT7 mediaservice; Fix memory leak | Justin McPherson | 2010-03-03 | 1 | -0/+1 |
| | | | | | | | | Reviewed-by: Dmytro Poplavskiy | ||||
| * | Undo a doc revert. | Justin McPherson | 2010-03-03 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Dmytro Poplavskiy | ||||
| * | Remove dependency on declarative from multimedia. | Justin McPherson | 2010-03-03 | 26 | -202/+77 |
| | | | | | | | | | | | | Move all declarative related classes into the multimedia declarative module. Reviewed-by: Andrew den Exter | ||||
* | | Improve grouped property error messages | Aaron Kennedy | 2010-03-04 | 4 | -8/+22 |
| | | | | | | | | QT-2579 | ||||
* | | Don't mess with highlight size if highlightFollowsCurrentItem is false. | Martin Jones | 2010-03-04 | 1 | -4/+7 |
| | | | | | | | | Task-number: QT-2630 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-04 | 11 | -39/+136 |
|\ \ | |||||
| * | | Remove Qt.playSound() | Michael Brasser | 2010-03-04 | 3 | -26/+1 |
| | | | | | | | | | | | | Use SoundEffect instead. | ||||
| * | | Add formatting functions to QML's global Qt object. | Michael Brasser | 2010-03-04 | 2 | -0/+69 |
| | | | | | | | | | | | | The plan is for these to replace DateTimeFormatter. | ||||
| * | | Signal handler requires exactly one value. | Michael Brasser | 2010-03-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Don't crash on invalid "PropertyAnimation on onClicked" | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-04 | 11 | -32/+98 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-04 | 4 | -21/+37 |
| | |\ \ | |||||
| | * | | | Compile without QVariant::EasingCurve in Qt 4.6.2. | Warwick Allison | 2010-03-04 | 7 | -11/+61 |
| | | | | | |||||
| * | | | | QDeclarativeContext::contextProperty() should also access ids | Aaron Kennedy | 2010-03-04 | 1 | -1/+4 |
| |/ / / | | | | | | | | | | | | | QT-2800 | ||||
* | | | | Fix ListView contentHeight calculation. | Martin Jones | 2010-03-04 | 1 | -2/+3 |
| |/ / |/| | | | | | | | | Task-number: QT-2630 | ||||
* | | | Documented view behavior when items are removed from start of view. | Martin Jones | 2010-03-04 | 2 | -0/+18 |
| | | | | | | | | | | | | Task-number: QTBUG-7694 | ||||
* | | | Remove unnecessary additional hash of QDeclarativeGridViewAttached | Martin Jones | 2010-03-04 | 2 | -21/+7 |
| | | | |||||
* | | | Fix spelling. | Martin Jones | 2010-03-04 | 2 | -2/+2 |
| | | | |||||
* | | | Document that the views do not set clip: true. | Martin Jones | 2010-03-04 | 2 | -0/+10 |
| | | | | | | | | | | | | Task-number: QT-2942 | ||||
* | | | Set StrongFocus on QDeclarativeView so that elements can get focus. | Martin Jones | 2010-03-04 | 1 | -0/+2 |
|/ / | | | | | | | Task-number: QTBUG-8637 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-03 | 1 | -6/+19 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-03 | 26 | -180/+400 |
| |\ \ | |||||
| * | | | Fix painting Rectangle with radius < side/2. | Martin Jones | 2010-03-03 | 1 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Falls back to using standard QPainter. Also avoid painting odd width borders between pixels, i.e. pixel align painting. Task-number: QTBUG-6675, QTBUG-8317, QTBUG-6786 | ||||
* | | | | Fix visibility of classes in private headers upon which Bauhaus/Creator relies. | Warwick Allison | 2010-03-03 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | Author: Erik Verbruggen | ||||
* | | | | system import path not supported with Qt 4.6. | Warwick Allison | 2010-03-03 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-03 | 26 | -180/+400 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-03 | 69 | -323/+1096 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (64 commits) More renaming: MouseRegion -> MouseArea Save secondary scope inside the expression's scope object 'on' syntax fixes QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject property Move JS global scope to top of the QML scope chain Add documentation for the 'when' property of Binding. Auto test for QTBUG-8677 QDeclarativeGuard should handle objects being deleted OS-friendlier, less noisy. fix crash, re-enable settings test Fix incorrect scope resolution for script in a script block. Disable until plugin objects problem resolved. silence debuggery add colorbrowser qml example Fix settings (was not exported type). Add import Qt.widgets 4.6 to layout.qml example make runnable from elsewhere remove debugger runnable from elsewhere Ensure error is received - the root object is INITIALLY zero. ... | ||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 4 | -20/+57 |
| | |\ \ | |||||
| | | * | | Save secondary scope inside the expression's scope object | Aaron Kennedy | 2010-03-03 | 4 | -20/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the secondary scope from contaminating scopes outside itself when used as a signal expression. QTBUG-8641 | ||||
| | * | | | More renaming: MouseRegion -> MouseArea | Yann Bodson | 2010-03-03 | 1 | -5/+5 |
| | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 7 | -40/+65 |
| | |\ \ | |||||
| | | * | | QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject ↵ | Aaron Kennedy | 2010-03-03 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property QT-2793 | ||||
| | | * | | Move JS global scope to top of the QML scope chain | Aaron Kennedy | 2010-03-03 | 6 | -38/+56 |
| | | | | | | | | | | | | | | | | | | | | QT-2787 | ||||
| | * | | | 'on' syntax fixes | Yann Bodson | 2010-03-03 | 7 | -40/+40 |
| | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 1 | -0/+5 |
| | |\ \ | | | |/ | |||||
| | * | | Add documentation for the 'when' property of Binding. | Yann Bodson | 2010-03-03 | 1 | -1/+14 |
| | | | | |||||
| * | | | Gstreamer media backend: ensure the null video output is not deleted | Dmytro Poplavskiy | 2010-03-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | during player session lifetime Reviewed-by: Andrew den Exter | ||||
| * | | | Use mute property instead of setting volume to 0 if playbin2 is used. | Dmytro Poplavskiy | 2010-03-03 | 1 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTMOBILITY-67 Reviewed-by: Andrew den Exter | ||||
| * | | | Gstreamer playback backend: Start loading media on setMedia(), | Dmytro Poplavskiy | 2010-03-03 | 4 | -59/+186 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without waiting for play() or pause(). To keep behaviour consisten with the rest of backends. Reviewed-by: Andrew den Exter | ||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵ | Qt Continuous Integration System | 2010-03-03 | 3 | -7/+11 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compiler warnings when compiling multimedia module. | ||||
| | * | | | Fixed compiler warnings when compiling multimedia module. | Kurt Korbatits | 2010-03-03 | 3 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by:Andrew den Exter | ||||
* | | | | | 4.6.x compat | Warwick Allison | 2010-03-03 | 1 | -0/+16 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-03 | 5 | -4/+9 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix incorrect scope resolution for script in a script block. | Michael Brasser | 2010-03-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure global variables in a script file are searched before component properties. Task-number: QTBUG-8641 | ||||
| * | | | Fix settings (was not exported type). | Warwick Allison | 2010-03-03 | 4 | -4/+8 |
| | | | | |||||
* | | | | QDeclarativeGuard should handle objects being deleted | Aaron Kennedy | 2010-03-03 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-03 | 1 | -7/+13 |
|\ \ \ |