Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Henrik Hartz | 2009-07-27 | 9 | -1/+219 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Fixed project dependencies | Roberto Raggi | 2009-07-26 | 2 | -0/+3 |
| | | |||||
| * | Added formal parameters to the QML signals. | Roberto Raggi | 2009-07-26 | 7 | -1/+216 |
| | | |||||
* | | compile fix | Henrik Hartz | 2009-07-27 | 1 | -1/+1 |
|/ | |||||
* | Added objectClassName now that objectType is the fully-qualified type | Erik Verbruggen | 2009-07-24 | 4 | -4/+25 |
| | | | | name. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-24 | 3 | -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 Hausmann | 2009-07-24 | 1 | -30/+30 |
| | | | | | | | | Reviewed-by: Trustme | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Rhys Weatherley | 2009-07-24 | 13 | -933/+1044 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Add QVector3D as a value type to QML | Rhys Weatherley | 2009-07-24 | 2 | -0/+74 |
| | | | | | | | | | | | | Reviewed-by: Aaron Kennedy | ||||
* | | | Add the fully-qualified type name to the DOM (via QmlParser::Object) | Warwick Allison | 2009-07-24 | 2 | -3/+4 |
| | | | | | | | | | | | | QML-defined ones are still defined by their URL, not a qualified name. | ||||
* | | | doc | Warwick Allison | 2009-07-24 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-24 | 23 | -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 Raggi | 2009-07-24 | 5 | -967/+1038 |
| | | | |||||
| * | | Accept the optional semicolon at the end of a signal declaration. | Roberto Raggi | 2009-07-24 | 5 | -878/+903 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-24 | 18 | -1470/+1011 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-07-24 | 16 | -1469/+995 |
| | |\ \ | | | |/ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Make custom string converters work for builtin variant metatypes | Rhys Weatherley | 2009-07-24 | 1 | -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 Raggi | 2009-07-24 | 10 | -263/+49 |
| | | | | |||||
| | | * | Revert "Introduced annotations" | Roberto Raggi | 2009-07-24 | 10 | -1204/+945 |
| | | | | | | | | | | | | | | | | This reverts commit 5f648e669235e0c6a11b6d25688c6dbd9bb58106. | ||||
| | | * | Revert "Fixed the semantic action of UiArrayMemberList" | Roberto Raggi | 2009-07-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | This reverts commit ee91cc1041681654f7a250dc197d0902c53a951f. | ||||
| | * | | Add a 'loading' property to fontfamily. | Yann Bodson | 2009-07-24 | 2 | -1/+16 |
| | |/ | |||||
| * | | Rename QmlBindableComponent to QmlComponentJS, as per Aaron's request. | Alan Alpert | 2009-07-24 | 5 | -35/+35 |
| |/ | |||||
* | | Fix assert | Warwick Allison | 2009-07-24 | 1 | -1/+1 |
|/ | | | | QmlMetaType::attachedPropertiesFuncId already has the hack, not needed from here too! | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-24 | 8 | -37/+392 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-23 | 2 | -22/+48 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Don't depend on qfxanchors.h. | Michael Brasser | 2009-07-23 | 3 | -27/+29 |
| | | | |||||
| * | | Compile fix after merge. | Michael Brasser | 2009-07-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-23 | 1129 | -6712/+56357 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Get anchor change transitions working. | Michael Brasser | 2009-07-23 | 5 | -54/+158 |
| | | | | |||||
| * | | | Add SetAnchors. | Michael Brasser | 2009-07-23 | 3 | -1/+250 |
| | | | | | | | | | | | | | | | | SetAnchors allows setting and resetting anchors in a state change. | ||||
* | | | | Throw in some cursory docs for QFxLineEdit | Alan Alpert | 2009-07-24 | 1 | -0/+37 |
| |_|/ |/| | | | | | | | | | | | Note that QFxLineEdit is quite unfinished, pending a review of the primitives. | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-23 | 16 | -107/+423 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-07-23 | 12 | -100/+176 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-23 | 2 | -2/+2 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Fixed the semantic action of UiArrayMemberList | Roberto Raggi | 2009-07-23 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Unreverts 6fc708801b5f0a616af2cbf44859ad9f6757579e | Warwick Allison | 2009-07-23 | 1 | -5/+5 |
| | | | | | |||||
| | * | | | Move import access functions to QmlEnginePrivate. | Warwick Allison | 2009-07-23 | 11 | -103/+179 |
| | |/ / | |||||
| * | | | Fix after Warwick's changes. | Yann Bodson | 2009-07-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-07-23 | 1104 | -6479/+55121 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Add QmlFontFamily. | Yann Bodson | 2009-07-23 | 3 | -0/+240 |
| | | | | |||||
| * | | | make scrollbars look nice again. | Yann Bodson | 2009-07-23 | 1 | -7/+7 |
| | | | | |||||
* | | | | Some SameGame cleanup | Alan Alpert | 2009-07-23 | 2 | -22/+48 |
| |/ / |/| | | | | | | | | Mostly commenting the JS code. | ||||
* | | | Doc and example fixes for library qualification (QT-558) | Warwick Allison | 2009-07-23 | 24 | -39/+40 |
| | | | |||||
* | | | Mark constant properties. | Warwick Allison | 2009-07-23 | 1 | -5/+5 |
| | | | | | | | | | | | | Avoid webbrowser demo warnings. | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-23 | 819 | -6442/+55281 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-23 | 802 | -6389/+55206 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Introduced annotations | Roberto Raggi | 2009-07-23 | 10 | -945/+1204 |
| | | | | | |||||
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Aaron Kennedy | 2009-07-23 | 772 | -5317/+53185 |
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h | ||||
| | | * | | Add the math3d types to QVariant | Rhys Weatherley | 2009-07-23 | 15 | -28/+452 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith | ||||
| | | * | | Compile in release mode for DFB version > 0.9 | Anders Bakken | 2009-07-22 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Something went wrong with the integrate from 4.5 to master. Reviewed-by: TrustMe |