summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-04-15325-2722/+4871
|\ | | | | | | into 4.7
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-152-24/+76
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Gstreamer media backend: seek to media start on end of stream.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-14315-2652/+4612
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (71 commits) Add QML documentation for validators Updates to the module documentation Fix minor typo in docs Revert "qdeclarativefocusscope works fine as a parallel test" qdeclarativefocusscope works fine as a parallel test Reduce warnings at shutdown Image with PreserveAspect enabled with either width or height defined should implicitly update the undefined axis to follow the aspect ratio Fix GridView.onRemove animation in photoviewer. Reduce warnings at shutdown Fix QT_NO_DESKTOPSERVICES Compiled bindings should not print warnings where normal bindings don't Update references links Move example code into separate files to make sure they compile Include qvariant.h as a convenience as context properties Merged 'orientation' into 'runtime' context property in qmlruntime Add 'runtime' property to the rootContext of DeclarativeViewer Temporarily disable tests that require compilation Fix qdeclarativedom test Further improve failure output Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystem ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-144-6/+19
| | |\ \
| | | * | Updates to the module documentationmae2010-04-143-4/+17
| | | | |
| | * | | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Note that regExp doesn't have a type, and so it is 'documented' as string. Task-number: QTBUG-9412
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-14118-1181/+1833
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-1412-5/+109
| | |\ \ \
| | | * | | Revert "qdeclarativefocusscope works fine as a parallel test"Aaron Kennedy2010-04-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scratch that, qdeclarativefocusscope does not work fine as a parallel test. This reverts commit 72fe46a6c72eb14cfc50cf59f372eb2872e867a0.
| | | * | | qdeclarativefocusscope works fine as a parallel testAaron Kennedy2010-04-141-0/+1
| | | | | |
| | | * | | Reduce warnings at shutdownAaron Kennedy2010-04-149-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9799 Reviewed-by: Alexis Menard
| | | * | | Image with PreserveAspect enabled with either width or height defined should ↵Joona Petrell2010-04-143-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implicitly update the undefined axis to follow the aspect ratio Task-number: Reviewed-by: Martin Jones
| | * | | | Fix minor typo in docsAlan Alpert2010-04-141-1/+1
| | |/ / /
| | * | | Fix GridView.onRemove animation in photoviewer.Yann Bodson2010-04-141-2/+2
| | | | |
| | * | | Reduce warnings at shutdownAaron Kennedy2010-04-147-9/+37
| | | | | | | | | | | | | | | | | | | | QTBUG-9799
| | * | | Fix QT_NO_DESKTOPSERVICESTasuku Suzuki2010-04-141-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2359 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alexis Menard2010-04-1463-493/+936
| | |\ \ \
| | | * | | Compiled bindings should not print warnings where normal bindings don'tAaron Kennedy2010-04-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9813
| | | * | | Update references linksBea Lam2010-04-141-0/+1
| | | | | |
| | | * | | Move example code into separate files to make sure they compileBea Lam2010-04-1418-163/+586
| | | | | | | | | | | | | | | | | | | | | | | | and work standalone
| | | * | | Include qvariant.h as a convenience as context propertiesBea Lam2010-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | are commonly set and accessed
| | | * | | Merged 'orientation' into 'runtime' context property in qmlruntimeLeonardo Sobral Cunha2010-04-143-41/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the 'Screen' element from DeclarativeViewer, as it was used only for the orientation property. Now access the 'orientation' property like this: 'runtime.orientation' and the enum is accessed as 'Orientation.Landscape', when using the qmlruntime. Updated docs for qmlruntime. Reviewed-by: Martin Jones
| | | * | | Add 'runtime' property to the rootContext of DeclarativeViewerLeonardo Sobral Cunha2010-04-142-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'runtime' property is a singleton object that contains various info about the execution environment for the qml application. Currently it contains just one property 'isActiveWindow', which tells if the window of the declarative viewer is active or not. Task-number: QTBUG-8902 Reviewed-by: Martin Jones
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1437-239/+251
| | | |\ \ \
| | | | * | | Fix qdeclarativedom testYann Bodson2010-04-141-9/+9
| | | | | | |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1449-309/+852
| | | | |\ \ \
| | | | | * | | Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-1435-229/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1467-401/+759
| | | | | |\ \ \
| | | | | * | | | Fix qdeclarativeloader test on windows.Martin Jones2010-04-141-1/+1
| | | | | | | | |
| | | | * | | | | Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystemMartin Jones2010-04-142-1/+13
| | | | | | | | |
| | | * | | | | | Temporarily disable tests that require compilationAaron Kennedy2010-04-141-0/+3
| | | | | | | | |
| | | * | | | | | Further improve failure outputAaron Kennedy2010-04-141-57/+7
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | Now prints all the failures, not just the first.
| | | * | | | | Remove double fail messageAaron Kennedy2010-04-141-2/+0
| | | | | | | |
| | | * | | | | Improve test failure messageAaron Kennedy2010-04-141-1/+2
| | | | | | | |
| | | * | | | | Fix qdeclarativeloader test on WindowsYann Bodson2010-04-141-4/+5
| | | | | | | |
| | * | | | | | Integrate merge-request #2361 into branch '4.7'Alexis Menard2010-04-143-5/+11
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tasuku Suzuki (1): Fix QT_NO_GRAPHICSEFFECT Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| | | * | | | | Merge branch '4.7' into reviews/2361Alexis Menard2010-04-144642-165823/+343879
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.h
| | * | | | | | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-1413-75/+613
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add a extension object to bring the anchors property for a QGraphicsWidget. The actual implement uses a separate object for storing the anchor pointer. In the future it would be nice if the extension object is the anchor itself. Also there are two connects extra for QGraphicsWidget one can perhaps disappear with a later commit. Only baseline case is not supported because QGraphicsWidget don't have any concept of baseline. Reviewed-by:akennedy
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1444-44/+96
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-142-1/+28
| | | |\ \ \ \ \
| | | * | | | | | Stabilize test.Warwick Allison2010-04-148-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses built-in server.
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-144-8/+8
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1419-414/+241
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Give better error messages on plugin load failures.Warwick Allison2010-04-142-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes reverted commit e0dcdbd2984299665b9b784b201289219b9978d3.
| | | * | | | | | | | More verbose message on failure.Warwick Allison2010-04-141-1/+4
| | | | | | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-143968-159784/+330035
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Pass even if $LANG is not set to en_US.*Warwick Allison2010-04-1433-16/+37
| | | | | | | | | | | |
| | * | | | | | | | | | Missing fileAaron Kennedy2010-04-141-0/+5
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-142-6/+6
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Doc fix.Michael Brasser2010-04-142-6/+6
| | | | | | | | | | |
generated by cgit v0.12 at 2024-09-27 02:21:55 (GMT)