summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-046-5/+27
|\
| * Fix grammar stringifying "on" as "readonly"Aaron Kennedy2010-03-046-5/+27
| | | | | | | | QTBUG-8676
* | Move the multimedia files to the correct place.Martin Jones2010-03-048-0/+0
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-0434-212/+107
|\ | | | | | | | | Conflicts: src/src.pro
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-0434-211/+107
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix namespace qml decleration. Cocoa namespace fixes. Namespace fixes. QT7 mediaservice; Fix memory leak Undo a doc revert. Remove dependency on declarative from multimedia.
| | * Fix namespace qml decleration.Justin McPherson2010-03-041-2/+1
| | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | * Cocoa namespace fixes.Justin McPherson2010-03-041-1/+1
| | | | | | | | | | | | Reviewed-by: Rohan McGovern
| | * Namespace fixes.Justin McPherson2010-03-041-3/+4
| | | | | | | | | | | | Reviewed-by: Rohan McGovern
| | * QT7 mediaservice; Fix memory leakJustin McPherson2010-03-031-0/+1
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * Undo a doc revert.Justin McPherson2010-03-031-1/+1
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * Remove dependency on declarative from multimedia.Justin McPherson2010-03-0330-206/+101
| | | | | | | | | | | | | | | | | | Move all declarative related classes into the multimedia declarative module. Reviewed-by: Andrew den Exter
* | | Improve grouped property error messagesAaron Kennedy2010-03-0412-9/+48
| | | | | | | | | | | | QT-2579
* | | Don't mess with highlight size if highlightFollowsCurrentItem is false.Martin Jones2010-03-041-4/+7
| | | | | | | | | | | | Task-number: QT-2630
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0416-53/+288
|\ \ \
| * | | Remove Qt.playSound()Michael Brasser2010-03-046-40/+9
| | | | | | | | | | | | | | | | Use SoundEffect instead.
| * | | Add formatting functions to QML's global Qt object.Michael Brasser2010-03-045-0/+193
| | | | | | | | | | | | | | | | The plan is for these to replace DateTimeFormatter.
| * | | Signal handler requires exactly one value.Michael Brasser2010-03-041-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.7Aaron Kennedy2010-03-0414-44/+112
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-046-32/+50
| | |\ \ \
| | * | | | Compile without QVariant::EasingCurve in Qt 4.6.2.Warwick Allison2010-03-047-11/+61
| | | | | |
| * | | | | QDeclarativeContext::contextProperty() should also access idsAaron Kennedy2010-03-042-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | QT-2800
* | | | | | Fix ListView contentHeight calculation.Martin Jones2010-03-041-2/+3
| |_|/ / / |/| | | | | | | | | | | | | | Task-number: QT-2630
* | | | | Documented view behavior when items are removed from start of view.Martin Jones2010-03-042-0/+18
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7694
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-042-11/+13
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-043-0/+12
| |\ \ \ \ \
| * | | | | | Fix tests failing due to javascript eval errors.Bea Lam2010-03-042-11/+13
| | |_|/ / / | |/| | | |
* | | | | | Remove unnecessary additional hash of QDeclarativeGridViewAttachedMartin Jones2010-03-042-21/+7
| |/ / / / |/| | | |
* | | | | Fix spelling.Martin Jones2010-03-042-2/+2
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix test.Michael Brasser2010-03-041-1/+1
| |/ / /
* | | | Document that the views do not set clip: true.Martin Jones2010-03-042-0/+10
| | | | | | | | | | | | | | | | Task-number: QT-2942
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0413-37/+47
|\ \ \ \ | |/ / /
| * | | Fix benchmarks.Michael Brasser2010-03-0413-37/+47
| | | | | | | | | | | | | | | | Get them all running again after renames, etc.
* | | | Set StrongFocus on QDeclarativeView so that elements can get focus.Martin Jones2010-03-041-0/+2
|/ / / | | | | | | | | | Task-number: QTBUG-8637
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-036-5/+26
|\ \ \
| * | | Fix Samegame.Michael Brasser2010-03-031-1/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-033-13/+31
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-031-6/+19
| | |\ \ \
| | * | | | Increase test timerBea Lam2010-03-031-1/+2
| | | | | |
| * | | | | Fix visibility of classes in private headers upon which Bauhaus/Creator relies.Warwick Allison2010-03-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Author: Erik Verbruggen
| * | | | | system import path not supported with Qt 4.6.Warwick Allison2010-03-031-0/+4
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-0353-204/+539
| |\ \ \ \ \
| * | | | | | 4.6.x compatWarwick Allison2010-03-031-0/+16
| | | | | | |
* | | | | | | Make sure currentIndex is updated when view is flicked.Martin Jones2010-03-031-0/+1
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | Task-number: QTBUG-8396
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-032-7/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0368-243/+925
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fix test to listen for signal instead of try-waiting for property.Bea Lam2010-03-032-7/+11
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0352-202/+527
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0358-234/+906
| |\ \ \ \ \
| | * | | | | make example work againmae2010-03-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code is now a bit on the imperative side, but that was the only working solution to remove the binding loops.