summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc fix.Michael Brasser2010-03-051-1/+5
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-0569-935/+1115
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-05194-2509/+2363
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-05211-2184/+2133
| | |\ | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-051-148/+173
| | | |\
| | | | * Fix compiler warning on RVCTAaron Kennedy2010-03-051-148/+173
| | | | | | | | | | | | | | | | | | | | | | | | | Anonymous structures in unions cause warnings on this compiler. QTBUG-8738
| | | * | Delete uninspiring example.Yann Bodson2010-03-051-46/+0
| | | | |
| | | * | Use new enum syntax for value types.Yann Bodson2010-03-051-11/+11
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0526-78/+340
| | | |\
| | | | * Allow unquoted enum syntax for value typesAaron Kennedy2010-03-0514-8/+89
| | | | | | | | | | | | | | | | | | | | QTBUG-5424
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-057-17/+167
| | | | |\
| | | | | * Add missing NOTIFYs to timer, xmllistmodel, xmlroleJoona Petrell2010-03-057-17/+167
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy
| | | | * | More declarative examples cleanup.Yann Bodson2010-03-053-20/+24
| | | | | |
| | | | * | Improve declarative tabs example.Yann Bodson2010-03-052-33/+60
| | | | |/
| | | * | Expect fail in currentIndex test for now.Martin Jones2010-03-051-26/+20
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-0525-199/+219
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-05398-1467/+4312
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (104 commits) Include QML doc snippets in examples autotest Update QML documentation snippets to latest syntax. MouseRegion is dead. Long live MouseArea. Compile fix for wince Update QML PropertyAnimation::easing docs Add testcase for QTBUG-7730 Add autotests for tab and backtab in Keys and KeyNavigation. Run signal expressions on attached property objects in correct scope Fixup test Add support for tab and backtab in KeyNavigation Mark QGraphicsItem position properties as FINAL Move the multimedia files to the correct place. Fix grammar stringifying "on" as "readonly" Improve grouped property error messages Don't mess with highlight size if highlightFollowsCurrentItem is false. Fix ListView contentHeight calculation. Remove Qt.playSound() Add formatting functions to QML's global Qt object. Signal handler requires exactly one value. QDeclarativeContext::contextProperty() should also access ids ...
| | | | | * Include QML doc snippets in examples autotestAaron Kennedy2010-03-052-0/+4
| | | | | |
| | | | | * Update QML documentation snippets to latest syntax.Aaron Kennedy2010-03-056-29/+5
| | | | | |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0417-170/+210
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QScript: Fix crash when converting a null value to a variant. QPrinter: Add Current Page print range support Fix build when egl.h includes X11 headers & pollutes namespace Fix build on EGL implementations where EGLConfig is a pointer Delay the resize section for better performance.
| | | | | * | QScript: Fix crash when converting a null value to a variant.Olivier Goffart2010-03-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes test tst_QScriptValue::equals(engine->newVariant(QVariant(123)) <=> engine->newArray(10)) Reviewed-by: Jedrzej Nowacki
| | | | | * | QPrinter: Add Current Page print range supportJohn Layt2010-03-049-139/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the selection of Current Page option in the print dialog by activating a new QPrintDialog::PrintDialogOption. If selected the PrintRange is set to CurrentPage. It is the responsibility of the application to read the PrintRange and apply the Current Page selection when rendering the pages. Merge-request: 2311 Reviewed-by: Trond
| | | | | * | Fix build when egl.h includes X11 headers & pollutes namespaceTom Cooksey2010-03-042-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point we should fix the include order in all the .cpp files, however #udef'ing the defines we use elsewhere seems to work for now. Reviewed-By: TrustMe
| | | | | * | Fix build on EGL implementations where EGLConfig is a pointerTom Cooksey2010-03-042-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGLConfig is an opaque type which we really shouldn't cast to an int. Instead, we get the config id for the EGLConfig. Reviewed-By: TrustMe
| | | | | * | Delay the resize section for better performance.Pierre Rossi2010-03-043-12/+5
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was particularly unusable when combining a QSortFilterProxyModel with resize mode ResizeToContents. Task-number: QTBUG-8540 Reviewed-by: Thierry
| | | * | | declarative examples cleanupYann Bodson2010-03-057-40/+12
| | | | |/ | | | |/|
| | | * | MouseRegion is dead. Long live MouseArea.Martin Jones2010-03-042-2/+1
| | | | |
| | * | | Fix test leaksBea Lam2010-03-052-0/+12
| | | | |
| | * | | Use _data() for some testsBea Lam2010-03-051-377/+158
| | | | |
| | * | | Add mapFromItem() and mapToItem() in QDeclarativeItem.Bea Lam2010-03-044-0/+158
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2385
| | * | | Removed unused variableBea Lam2010-03-041-1/+0
| | | | |
| * | | | Fix testBea Lam2010-03-051-7/+11
| | | | |
* | | | | Add basic support for explicit newParent in ParentAnimation.Michael Brasser2010-03-052-7/+57
| | | | |
* | | | | Document new ParentChange properties.Michael Brasser2010-03-051-6/+16
| | | | |
* | | | | Update QmlChanges.txtMichael Brasser2010-03-051-0/+2
| | | | |
* | | | | ParentAnimation docs + test.Michael Brasser2010-03-0510-0/+1785
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8612
* | | | | Remove NumberFormatter and DateTimeFormatter.Michael Brasser2010-03-0514-1642/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions have been added to QML's global Qt object for date/time formatting. Number formatting will not be supported for 4.7. Task-number: QT-2821
* | | | | RotationAnimation docs + test.Michael Brasser2010-03-044-10/+119
| |_|/ / |/| | | | | | | | | | | Task-number: QTBUG-8613
* | | | Compile fix for winceThierry Bastian2010-03-041-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Leo Cunha
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-04390-1436/+4302
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (100 commits) Update QML PropertyAnimation::easing docs Add testcase for QTBUG-7730 Add autotests for tab and backtab in Keys and KeyNavigation. Run signal expressions on attached property objects in correct scope Fixup test Add support for tab and backtab in KeyNavigation Mark QGraphicsItem position properties as FINAL Move the multimedia files to the correct place. Fix grammar stringifying "on" as "readonly" Improve grouped property error messages Don't mess with highlight size if highlightFollowsCurrentItem is false. Fix ListView contentHeight calculation. Remove Qt.playSound() Add formatting functions to QML's global Qt object. Signal handler requires exactly one value. QDeclarativeContext::contextProperty() should also access ids Compile without QVariant::EasingCurve in Qt 4.6.2. Documented view behavior when items are removed from start of view. Fix tests failing due to javascript eval errors. Remove unnecessary additional hash of QDeclarativeGridViewAttached ...
| * | | Update QML PropertyAnimation::easing docsLeonardo Sobral Cunha2010-03-041-2/+17
| | | | | | | | | | | | | | | | Task-number: QTBUG-8726
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Justin McPherson2010-03-0413-16/+134
| |\ \ \
| | * | | Add testcase for QTBUG-7730Aaron Kennedy2010-03-042-0/+29
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-049-16/+57
| | |\ \ \
| | | * | | Run signal expressions on attached property objects in correct scopeAaron Kennedy2010-03-049-16/+57
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-8677
| | * | | | Add autotests for tab and backtab in Keys and KeyNavigation.Yann Bodson2010-03-043-0/+48
| | |/ / /
| * | | | Merge branch '4.7' of ../../qt-qml/4.7 into 4.7Justin McPherson2010-03-04383-1425/+4158
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-041-1/+1
| | |\ \ \
| | | * | | Fixup testAaron Kennedy2010-03-041-1/+1
| | | | | |
| | * | | | Merge branch 'tab-navigation' into 4.7Yann Bodson2010-03-042-14/+87
| | |\ \ \ \ | | | |/ / / | | |/| | |