summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-21/+14
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-232-21/+14
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: API fixes to QGLBuffer.
| | * API fixes to QGLBuffer.Rhys Weatherley2010-03-222-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | Use GLuint for bufferId(), not uint. Replace the raw bind() function with a raw release(), because that's the only useful case for being able to do a raw glBindBuffer(). Reviewed-by: Daniel Pope
* | | Usability improvements for photoviewer demo.Yann Bodson2010-03-235-8/+32
| | |
* | | Fix warning.Michael Brasser2010-03-231-1/+1
| | |
* | | Changing the alignment property should trigger a repaint.Alexis Menard2010-03-232-0/+34
| | | | | | | | | | | | | | | | | | | | | Just clear the cache when the property changes. Task-number:QTBUG-8155 Reviewed-by:Yann Bodson
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2334-1657/+257
|\ \ \
| * | | Change default RotationAnimation direction.Michael Brasser2010-03-233-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | Shortest as default too often led to unintuitive behavior. For example, RotationAnimation { from: 0; to: 360 } will not animate at all. Numerical gives the least surprising results.
| * | | Add missing NOTIFYs.Michael Brasser2010-03-234-7/+41
| | | | | | | | | | | | | | | | Task-number: QTBUG-8816
| * | | Remove ParentAction.Michael Brasser2010-03-2317-1527/+19
| | | | | | | | | | | | | | | | It has been replaced with ParentAnimation.
| * | | Editable tag in photoviewer demo.Yann Bodson2010-03-234-15/+61
| | | |
| * | | Small photoviewer improvementsYann Bodson2010-03-233-5/+13
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-232-7/+2
| |\ \ \
| | * | | Fix mutex handling that was causing tests to sometimes crash/fail.Bea Lam2010-03-232-7/+2
| | | | |
| * | | | DocAaron Kennedy2010-03-237-87/+111
| |/ / /
* | | | Basic Loader origin safety (for discussion).Warwick Allison2010-03-237-2/+69
| | | |
* | | | Show loading progressWarwick Allison2010-03-233-2/+21
|/ / / | | | | | | | | | Task-number: QTBUG-9260
* | | Fix test (StoreScriptImported shifted enum values)Warwick Allison2010-03-221-2/+11
| | | | | | | | | | | | | | | Adds test for StoreScriptImported. Makes invalid instruction test resistant to future changes.
* | | Manual merge.Warwick Allison2010-03-2216-11/+95
| | |
* | | Test imports with realistic paths (previously passed accidentally).Warwick Allison2010-03-225-7/+15
| | | | | | | | | | | | Fix failure when import path is ancestor dir of other import path.
* | | Add Script removal to QmlChanges.txtMartin Jones2010-03-221-0/+38
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2299-1034/+890
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits) Use canonical form for headers Remove exporting of QDeclarativeContext class symbols Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. ...
| * | Use canonical form for headersKai Koehne2010-03-221-2/+2
| | | | | | | | | | | | | | | | | | Allows QmlDesigner to use qdeclarativestate_p_p.h Reviewed-by: Marco Bubke
| * | Remove exporting of QDeclarativeContext class symbolsKai Koehne2010-03-221-1/+1
| | | | | | | | | | | | We're not using it in QmlDesigner any more
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1031/+887
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing ...
| | * | Remove non-existing header from pri fileKai Koehne2010-03-221-2/+1
| | | | | | | | | | | | | | | | Got added in 081fafe395d52.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1029/+886
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (23 commits) Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing Fix local type lookup ...
| | | * | Fix Loader crash.Michael Brasser2010-03-225-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If setting the source of a Loader triggered a change to the source (i.e. the thing being loaded set the source to something else) a crash would occur. We now no longer delete the component immediately when the source changes. Task-number: QTBUG-9241
| | | * | Compile in namespaceAaron Kennedy2010-03-221-1/+1
| | | | |
| | | * | Deprecate inline Script {} blocksAaron Kennedy2010-03-2238-366/+521
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
| | | * | Update metaobjectbuilder version test.Martin Jones2010-03-221-4/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2918
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2228-568/+25
| | | |\ \
| | | | * | Removed wrong parenthesis around property NOTIFY declarationLeonardo Sobral Cunha2010-03-221-1/+1
| | | | | |
| | | | * | Remove dead performance measurement code from QMLAaron Kennedy2010-03-2223-563/+2
| | | | | |
| | | | * | Fix warning mentioned in the comments of QTBUG-9182.Michael Brasser2010-03-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the 'stackBefore' sibling in ParentChanges is cleared if the target is the last child.
| | | | * | Fix test.Michael Brasser2010-03-223-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom type to test this language feature, rather than PropertyChanges.
| | | * | | Set role names for QFileSystemModel and QDirModelMartin Jones2010-03-224-0/+70
| | | |/ / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7479 Reviewed-by: Alexis Menard
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-224-6/+13
| | | |\ \
| | | | * | Fix qdeclarativeqt::createQmlObject autotestLeonardo Sobral Cunha2010-03-222-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | The warning message expected in this test changed.
| | | | * | Fix qdeclarativetextedit::delegateLoading autotestLeonardo Sobral Cunha2010-03-222-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | After d039e2e8307, this test broke because of restricted remote imports.
| | | * | | Ensure positioner animations are triggered correctlyMartin Jones2010-03-221-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9219
| | | * | | Add MiddleButton = MidButton to MouseButtons enum.Martin Jones2010-03-222-1/+3
| | | |/ / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6617 Reviewed-by: Alexis Menard
| | | * | Fix Behavior documentation due to easing changes.Martin Jones2010-03-211-1/+2
| | | | |
| | | * | Fix crash when calling createObject on a component with errors.Michael Brasser2010-03-213-0/+22
| | | | |
| | | * | Initialize variable.Michael Brasser2010-03-211-1/+1
| | | | |
| | | * | Produce an error when trying to create objects in a PropertyChanges.Michael Brasser2010-03-213-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State-specific object lifecycle management will be addressed in a future release. Task-number: QTBUG-8318
| | | * | Fix Flipable crash.Michael Brasser2010-03-213-3/+23
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9161
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Reduce amount of qmldir parsing Fix local type lookup Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Reduce amount of qmldir parsing Fix local type lookup Initialize variable. Setting stacking order from top to bottom seems to work better. Don't crash if an out of bounds model index is accessed.
| | | | | * | Reduce amount of qmldir parsingmae2010-03-194-34/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by storing the parsed components (QDeclarativeDirComponents). There's still potential for optimization (QT-617)