summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-21/+14
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-232-21/+14
| |\
| | * API fixes to QGLBuffer.Rhys Weatherley2010-03-222-21/+14
* | | 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
* | | 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
| * | | Add missing NOTIFYs.Michael Brasser2010-03-234-7/+41
| * | | Remove ParentAction.Michael Brasser2010-03-2317-1527/+19
| * | | 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
|/ / /
* | | Fix test (StoreScriptImported shifted enum values)Warwick Allison2010-03-221-2/+11
* | | Manual merge.Warwick Allison2010-03-2216-11/+95
* | | Test imports with realistic paths (previously passed accidentally).Warwick Allison2010-03-225-7/+15
* | | 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
|\ \ \ | |/ / |/| |
| * | Use canonical form for headersKai Koehne2010-03-221-2/+2
| * | Remove exporting of QDeclarativeContext class symbolsKai Koehne2010-03-221-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1031/+887
| |\ \
| | * | Remove non-existing header from pri fileKai Koehne2010-03-221-2/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2298-1029/+886
| | |\ \
| | | * | Fix Loader crash.Michael Brasser2010-03-225-1/+63
| | | * | Compile in namespaceAaron Kennedy2010-03-221-1/+1
| | | * | Deprecate inline Script {} blocksAaron Kennedy2010-03-2238-366/+521
| | | * | Update metaobjectbuilder version test.Martin Jones2010-03-221-4/+4
| | | * | 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
| | | | * | Fix test.Michael Brasser2010-03-223-1/+20
| | | * | | Set role names for QFileSystemModel and QDirModelMartin Jones2010-03-224-0/+70
| | | |/ /
| | | * | 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
| | | | * | Fix qdeclarativetextedit::delegateLoading autotestLeonardo Sobral Cunha2010-03-222-0/+5
| | | * | | Ensure positioner animations are triggered correctlyMartin Jones2010-03-221-18/+25
| | | * | | Add MiddleButton = MidButton to MouseButtons enum.Martin Jones2010-03-222-1/+3
| | | |/ /
| | | * | 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
| | | * | Fix Flipable crash.Michael Brasser2010-03-213-3/+23
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| | | | |\ \
| | | | | * | Reduce amount of qmldir parsingmae2010-03-194-34/+38