summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-30151-1250/+6586
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits) expect fail for some PinchArea tests on mac Allow functions to be passed in as values for grouped properties Fix lineHeight autotests. Update Docs, Examples and Demos for new CreateObject overloadable Adding support for group properties in Component::CreateObject() Update test, versioning is fixed so expect-fail no longer needed Test failure fixed - remove XFAIL photoviewer needs QtQuick 1.1 for Image::cache disable some pincharea tests on mac temporarily Fix failing test on mac for Qt.application Fix test breakage for qdeclarativeworkerscript Fix typo in error message. Doc fix for lineHeight. Add support for line spacing in Text element. Fixing right-to-left text in Text and TextInput Fix MaximumLineCount in Text and add tests Ensure simple objects also get the appropriate property cache Add test for Loader implicitWidth/implicitHeight Don't crash when appending a null item Test for passing functions to createObject() for property bindings ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-29151-1250/+6586
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits) expect fail for some PinchArea tests on mac Allow functions to be passed in as values for grouped properties Fix lineHeight autotests. Update Docs, Examples and Demos for new CreateObject overloadable Adding support for group properties in Component::CreateObject() Update test, versioning is fixed so expect-fail no longer needed Test failure fixed - remove XFAIL photoviewer needs QtQuick 1.1 for Image::cache disable some pincharea tests on mac temporarily Fix failing test on mac for Qt.application Fix test breakage for qdeclarativeworkerscript Fix typo in error message. Doc fix for lineHeight. Add support for line spacing in Text element. Fixing right-to-left text in Text and TextInput Fix MaximumLineCount in Text and add tests Ensure simple objects also get the appropriate property cache Add test for Loader implicitWidth/implicitHeight Don't crash when appending a null item Test for passing functions to createObject() for property bindings ...
| | * Merge branch 'qtquick11' into 4.7Martin Jones2011-01-28151-1249/+6585
| | |\
| | | * Allow functions to be passed in as values for grouped propertiesBea Lam2011-01-281-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QDeclarativeProperty::write() works for grouped properties but stops functions values from being passed in, and using QScriptValue::setProperty() on the object being created allows functions to be passed in but doesn't work for grouped properties. This fix walks down the tree for grouped properties to find the property that should be set so that functions can be set for grouped property values. Reviewed-by: Aaron Kennedy
| | | * Adding support for group properties in Component::CreateObject()Christopher Ham2011-01-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QScriptValue overload for Component::CreateObject() should be able to set group properties. This change also allows for property binding from Javascript to continue to function. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| | | * Fix test breakage for qdeclarativeworkerscriptBea Lam2011-01-281-1/+3
| | | | | | | | | | | | | | | | Broken by 43b8305367156c1ceb09eb4a056bdae3f325b5eb.
| | | * Doc fix for lineHeight.Yann Bodson2011-01-281-1/+3
| | | |
| | | * Add support for line spacing in Text element.Yann Bodson2011-01-285-6/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the lineHeight and lineHeightMode properties. Task-number: QTBUG-14296 Reviewed-by: Martin Jones
| | | * Fixing right-to-left text in Text and TextInputChristopher Ham2011-01-284-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Text and TextInput items should now automatically flip the alignment of right-to-left text. Autotests also added to ensure the text is on the correct side (added for TextInput also). Task-number: QTBUG-15880 Reviewed-by: Martin Jones
| | | * Fix MaximumLineCount in Text and add testsChristopher Ham2011-01-281-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed MaximumLineCount not truncating when wrapMode was not set. Visual autotests were added to test various possible options for maximumLineCount. Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
| | | * Ensure simple objects also get the appropriate property cacheAaron Kennedy2011-01-283-11/+9
| | | | | | | | | | | | | | | | Task-number: QTBUG-13849
| | | * Don't crash when appending a null itemAaron Kennedy2011-01-271-5/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-16871
| | | * Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-272-3/+3
| | | |\
| | | | * Fix object check in createObjectChristopher Ham2011-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'if' check for the value map was inverted. Spelling in warning was fixed. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| | | | * Apply property bindings during component creation. Add versioningChristopher Ham2011-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versioning for QtQuick 1.1 was added for invokable method in component. Full changes are in: aa40f956bab22678b62f630af97f51f9e8fab9f8 Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| | | * | Add missing revisions for QtQuick 1.1 additionsMartin Jones2011-01-276-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15279 Reviewed-by: Michael Brasser
| | | * | Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-2755-212/+1262
| | | |\ \ | | | | |/
| | | | * Fix righ-to-left support in text components.Christopher Ham2011-01-273-13/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In text, textEdit and textInput, the layout of the text should automatically align to the right if the it is deemed to be right-to-left text. Task-number: QTBUG-15880 Reviewed-by: Bea Lam
| | | | * Don't load components until the Loader component itself is completedBea Lam2011-01-272-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously components were loaded as soon as setSource() or setSourceComponent() were called, even if the Loader component was not complete. If a source component had been set, the itemChanged(), statusChanged() etc. signals would be emitted before the Loader would be complete and before the internal item had been sized. If a source had been set via url, these signals were not emitted at all. It also caused loaded() to be emitted twice for components set by setSourceComponent(). Task-number: QTBUG-16319 Reviewed-by: Martin Jones
| | | | * Allow property bindings to be easily created from JavaScriptBea Lam2011-01-279-17/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properties can now be assigned a function that returns the binding value. Task-number: QTBUG-14964 Reviewed-by: Aaron Kennedy
| | | | * Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-2717-121/+441
| | | | |\
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-2743-211/+1079
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/graphicsitems/qdeclarativelistview.cpp
| | | * | | | Setting the size of a loader overwrote its implict size.Martin Jones2011-01-272-4/+21
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the created item does not have a valid width/height then our implictWidth/Height should be the same as the items implict size. Task-number: QTBUG-16928 Reviewed-by: Bea Lam
| | | * | | Implement property versioning inside the declarative engineAaron Kennedy2011-01-2717-121/+441
| | | |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-13451
| | | * | Fix warnings.Michael Brasser2011-01-251-2/+2
| | | | |
| | | * | Fix critical spelling mistake.Martin Jones2011-01-251-1/+1
| | | | |
| | | * | Add location information for tracing.Michael Brasser2011-01-255-12/+63
| | | | |
| | | * | Add "Complete" message for tracing.Michael Brasser2011-01-252-0/+7
| | | | |
| | | * | Notify that pressed has changed before calling the onClicked handler.Michael Brasser2011-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a more natural ordering, and makes it trivial to control different state groups with pressed and onClicked. Reviewed-by: Martin Jones
| | | * | Improve information reported for MouseArea hover events.Michael Brasser2011-01-251-2/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| | | * | Fix copy-paste error in QDeclarativeMouseArea::hoverMoveEvent.Michael Brasser2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| | | * | Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-2426-57/+514
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overridden as readonly for elements that have an inherent implicit size such as Text, TextEdit, TextInput, positioners, Loader. Task-number: QTBUG-14957 Reviewed-by: Michael Brasser
| | | * | Change Qt.application.layoutDirection from bool to correct type of ↵Joona Petrell2011-01-192-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt::LayoutDirection Task-number: QTBUG-16424 Reviewed-by: Martin Jones
| | | * | Add a layout direction example to positionersJoona Petrell2011-01-191-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Alan Alpert
| | | * | Rename Image::cached to 'cached' (and QDeclarativePixmap::Cached also)Bea Lam2011-01-197-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to keep consistent property naming consistent. E.g. Image has 'smooth', 'mirror' properties rather than 'smoothed', 'mirrored'. For consistency QDeclarativePixmap::Cached was renamed as well. Reviewed-by: Martin Jones
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-193851-4893/+11325
| | | |\ \
| | | * | | Compile on windowsAlan Alpert2011-01-181-6/+8
| | | | | |
| | | * | | Avoid index out of bounds array accessesAlan Alpert2011-01-181-2/+5
| | | | | |
| | | * | | Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Alan Alpert2011-01-186-24/+9
| | | |\ \ \
| | | | * | | Fix declarative autotest compilation on SymbianJoona Petrell2011-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | | * | | Fix QtDeclarative compilation warningsJoona Petrell2011-01-185-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | * | | | Implement layoutDirection property on Row, Grid, FlowAlan Alpert2011-01-183-21/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Joona Petrell
| | | * | | | Document TextInput::readOnlyAlan Alpert2011-01-181-0/+10
| | | | | | |
| | | * | | | Proper versioning for canPasteAlan Alpert2011-01-182-2/+2
| | | |/ / /
| | | * | | Fix memory leakAaron Kennedy2011-01-171-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Introduced by 488e616b50707e5b37162e6d0cfc71a1ffdf9bef
| | | * | | Add canPaste property to TextInput and TextEditAlan Alpert2011-01-176-3/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16190 Reviewed-by: Martin Jones
| | | * | | Remove unnecessary debug traces from declarative classesJoona Petrell2011-01-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | * | | Add lineCount property to QDeclarativeTextEditChristopher Ham2011-01-144-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lineCount property should return the number of lines contained in textEdit. Also corrected minor documentation in Text Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
| | | * | | QDeclarativeText has new multiline propertiesChristopher Ham2011-01-143-15/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LineCount should return the number of lines currently being displayed. Setting maximumLineCount limits the number of lines that will be shown Truncated will return true if the text has been elided normally, or if the lines have been limited due to maximumLineCount. Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
| | | * | | Add NOTIFY signals to Flipable 'front' and 'back' propertiesBea Lam2011-01-132-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the change notifications themselves may not be that useful, as these properties are write-once, adding the NOTIFY signals allows the properties to be used in bindings. Task-number: QTBUG-16580, QTBUG-14551 Reviewed-by: Martin Jones
generated by cgit v0.12 at 2025-03-12 12:17:44 (GMT)