summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Call QDeclarativeItem::geometryChanged() base implementationAaron Kennedy2010-05-065-1/+49
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-064-7/+28
|\
| * Fix autotestAaron Kennedy2010-05-061-0/+1
| |
| * Add QML_XHR_DUMP optionAaron Kennedy2010-05-061-0/+21
| |
| * CompileAaron Kennedy2010-05-061-1/+0
| |
| * doc fixesYann Bodson2010-05-061-6/+6
| |
* | Add missing test file.Martin Jones2010-05-061-0/+16
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-053-3/+4
|\
| * Another initialization fix. Unleak.Warwick Allison2010-05-052-1/+2
| |
| * Fix compile in namespace.Michael Brasser2010-05-051-2/+2
| |
* | Doc: more clarification of cacheBufferMartin Jones2010-05-052-0/+6
| |
* | Fix some compiler warnings.Martin Jones2010-05-052-24/+25
|/
* Initialize variable and crash less.Martin Jones2010-05-051-0/+1
|
* Add a switch to the menu to hide/show the runtime warningsKai Koehne2010-05-055-17/+222
| | | | Reviewed-by: mae
* Fix i18n example.Yann Bodson2010-05-056-17/+81
| | | | Add french translation to photoviewer demo.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-05100-531/+999
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0535-120/+154
| |\
| | * Use enum rather than string for easing type.Yann Bodson2010-05-0535-120/+154
| | |
| * | Fix cacheBuffer documentation.Martin Jones2010-05-053-12/+28
| |/ | | | | | | Task-number: QTBUG-10385
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-058-22/+22
| |\
| | * Docs - point to property types from tutorial and QML Basic Types pageBea Lam2010-05-052-10/+13
| | |
| | * Fix qdoc errorsBea Lam2010-05-056-12/+9
| | |
| * | Document delegate life cycle.Martin Jones2010-05-053-1/+11
| | | | | | | | | | | | Task-number: QTBUG-10353
| * | little doc fix.Martin Jones2010-05-051-1/+1
| |/
| * Turn off smooth rendering for qDrawBorderPixmap() with transforms.Martin Jones2010-05-051-0/+14
| | | | | | | | | | | | | | | | | | On non-gl graphics systems smooth rendering of qDrawBorderPixmap() with a transform applied resulted in ugly artifacts. Better to draw without smooth and get a correct looking result, though with jaggy edges. Task-number: QTBUG-5687 Reviewed-by: Gunnar
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0521-207/+223
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-053-2/+13
| | |\
| | | * Don't start valuesource animations until all component objects have been ↵Michael Brasser2010-05-053-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | completed. Task-number: QTBUG-9413
| | * | docWarwick Allison2010-05-0519-205/+210
| | |/ | | | | | | | | | Task-number: QTBUG-10386
| * | Test for QList<QObject*> model with object properties changing.Martin Jones2010-05-051-0/+99
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0535-152/+396
| |\ \ | | |/
| | * Example i18n.Warwick Allison2010-05-056-0/+69
| | |
| | * Allow translations without extra command-line args, and document both.Warwick Allison2010-05-053-27/+68
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0558-467/+874
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-0522-119/+251
| | | |\
| | | | * Doc improvements, simplify example codeBea Lam2010-05-0519-118/+208
| | | | |
| | | | * Enable states to be activated via their 'when' clause even if unnamed.Michael Brasser2010-05-053-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autogenerate a name for unnamed states: "anonymousState1", etc. Task-number: QTBUG-10352 Reviewed-by: Aaron Kennedy
| | | * | Null objects should appear as JS nullAaron Kennedy2010-05-053-4/+5
| | | |/
| | | * Fix a crash with null objects returned from a Q_INVOKABLERhys Weatherley2010-05-051-1/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10412 Reviewed-by: Aaron Kennedy
| | * | syntax updateWarwick Allison2010-05-051-1/+1
| | | |
| * | | QList<QObject*> models now update their properties when they change.Martin Jones2010-05-058-15/+49
| | | | | | | | | | | | | | | | Task-number: QTBUG-10348
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0529-291/+514
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-044-52/+102
| |\ \ \
| * | | | Ensure flick endpoint is recalculated for variable height lists.Martin Jones2010-05-042-2/+3
| | |_|/ | |/| |
* | | | Move Qt.widgets import to be an unsupported exampleAlan Alpert2010-05-0525-268/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layout examples for QML are also cleaned up a bit. Layouts test removed, and LayoutItem test added, to clarify what we support. Reviewed-by: Michael Brasser
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-049-168/+315
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-04197-2236/+4507
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (74 commits) Optimization for QDeclarativePaintedItem. Update childrenRect when children are added or removed. Optimize childrenRect. Remove obsolete doc groupings. Doc improvements Remove QDeclarativeLoader::resizeMode Don't create an anchors element so that we can check that there aren't any Ensure eval and Function are in the correct scope Add availableFonts.qml for fonts examples. Add Qt.fontFamilies() method Avoid regenerating PathView delegates needlessly When a model delegate is released, remove it from the scene immediately. Fix assignment of value types to javascript var. More doc fixes Make QDeclarativeParserStatus method pure virtual to encourage right code. Doc fixes Fix error string Add QML value types for math3d types Fix assert in qdeclarativepathview Avoid divisions by zero in qdeclarativetimeline ...
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-049-168/+315
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2 Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+315
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2 Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
| | | * | | | Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Integrated http://trac.webkit.org/changeset/58673 -- Fix qtlibraryinfix not to contain space