summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Henrik Hartz2009-07-279-1/+219
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fixed project dependenciesRoberto Raggi2009-07-262-0/+3
| |
| * Added formal parameters to the QML signals.Roberto Raggi2009-07-267-1/+216
| |
* | compile fixHenrik Hartz2009-07-271-1/+1
|/
* Added objectClassName now that objectType is the fully-qualified typeErik Verbruggen2009-07-244-4/+25
| | | | name.
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-243-30/+104
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Convert linux-g++-x11egl/qmake.conf from DOS to Unix linefeeds.Simon Hausmann2009-07-241-30/+30
| | | | | | | | Reviewed-by: Trustme
| * Merge branch 'kinetic-declarativeui' of ↵Rhys Weatherley2009-07-2413-933/+1044
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Add QVector3D as a value type to QMLRhys Weatherley2009-07-242-0/+74
| | | | | | | | | | | | Reviewed-by: Aaron Kennedy
* | | Add the fully-qualified type name to the DOM (via QmlParser::Object)Warwick Allison2009-07-242-3/+4
| | | | | | | | | | | | QML-defined ones are still defined by their URL, not a qualified name.
* | | docWarwick Allison2009-07-241-3/+3
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-2423-1484/+1121
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Recognize formal arguments in the left hand side of a binding.Roberto Raggi2009-07-245-967/+1038
| | |
| * | Accept the optional semicolon at the end of a signal declaration.Roberto Raggi2009-07-245-878/+903
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-2418-1470/+1011
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-2416-1469/+995
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Make custom string converters work for builtin variant metatypesRhys Weatherley2009-07-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | With QVector3D now being a builtin variant type, the string converter code broke. This change looks for string converters for all kinds of types, just as in the rest of the QML code.
| | | * Removed support for CSS-like literals.Roberto Raggi2009-07-2410-263/+49
| | | |
| | | * Revert "Introduced annotations"Roberto Raggi2009-07-2410-1204/+945
| | | | | | | | | | | | | | | | This reverts commit 5f648e669235e0c6a11b6d25688c6dbd9bb58106.
| | | * Revert "Fixed the semantic action of UiArrayMemberList"Roberto Raggi2009-07-242-2/+2
| | | | | | | | | | | | | | | | This reverts commit ee91cc1041681654f7a250dc197d0902c53a951f.
| | * | Add a 'loading' property to fontfamily.Yann Bodson2009-07-242-1/+16
| | |/
| * | Rename QmlBindableComponent to QmlComponentJS, as per Aaron's request.Alan Alpert2009-07-245-35/+35
| |/
* | Fix assertWarwick Allison2009-07-241-1/+1
|/ | | | QmlMetaType::attachedPropertiesFuncId already has the hack, not needed from here too!
* Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-248-37/+392
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-232-22/+48
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Don't depend on qfxanchors.h.Michael Brasser2009-07-233-27/+29
| | |
| * | Compile fix after merge.Michael Brasser2009-07-231-1/+1
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-231129-6712/+56357
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Get anchor change transitions working.Michael Brasser2009-07-235-54/+158
| | | |
| * | | Add SetAnchors.Michael Brasser2009-07-233-1/+250
| | | | | | | | | | | | | | | | SetAnchors allows setting and resetting anchors in a state change.
* | | | Throw in some cursory docs for QFxLineEditAlan Alpert2009-07-241-0/+37
| |_|/ |/| | | | | | | | | | | Note that QFxLineEdit is quite unfinished, pending a review of the primitives.
* | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-2316-107/+423
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-2312-100/+176
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-232-2/+2
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Fixed the semantic action of UiArrayMemberListRoberto Raggi2009-07-232-2/+2
| | | | |
| | * | | Unreverts 6fc708801b5f0a616af2cbf44859ad9f6757579eWarwick Allison2009-07-231-5/+5
| | | | |
| | * | | Move import access functions to QmlEnginePrivate.Warwick Allison2009-07-2311-103/+179
| | |/ /
| * | | Fix after Warwick's changes.Yann Bodson2009-07-231-1/+1
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-231104-6479/+55121
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Add QmlFontFamily.Yann Bodson2009-07-233-0/+240
| | | |
| * | | make scrollbars look nice again.Yann Bodson2009-07-231-7/+7
| | | |
* | | | Some SameGame cleanupAlan Alpert2009-07-232-22/+48
| |/ / |/| | | | | | | | Mostly commenting the JS code.
* | | Doc and example fixes for library qualification (QT-558)Warwick Allison2009-07-2324-39/+40
| | |
* | | Mark constant properties.Warwick Allison2009-07-231-5/+5
| | | | | | | | | | | | Avoid webbrowser demo warnings.
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-23819-6442/+55281
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-23802-6389/+55206
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Introduced annotationsRoberto Raggi2009-07-2310-945/+1204
| | | | |
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-23772-5317/+53185
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| | | * | Add the math3d types to QVariantRhys Weatherley2009-07-2315-28/+452
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | | * | Compile in release mode for DFB version > 0.9Anders Bakken2009-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Something went wrong with the integrate from 4.5 to master. Reviewed-by: TrustMe