summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make sure we update Loader size if item size changes after creation.Martin Jones2011-02-023-1/+37
| | | | | Task-number: QTBUG-17114 Reviewed-by: Bea Lam
* Froze two more symbols and fixed compilation error (QtQuick11).juhvu2011-02-023-2/+6
| | | | Reviewed-by: Martin Jones
* PinchArea sometimes failed.Martin Jones2011-02-014-27/+6
| | | | | | | | Almost always failed on Mac and could fail on other systems due to QDeclarativePinchEvent::m_accepted not being initialized. Task-number: QTBUG-15491 Reviewed-by: Bea Lam
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7juhvu2011-02-0121-199/+957
|\
| * Clarify that IntValidator performs locale specific validation.Andrew den Exter2011-02-011-0/+5
| | | | | | | | | | Task-number: QTBUG-16873 Reviewed-by: Martin Jones
| * Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-0117-192/+778
| | | | | | | | | | | | | | | | | | | | | | Adds an option to do per word selection when selectByMouse is true. Also changes the selection behavior so that the first word selected remains selected when the direction of the selection changes which is more consistent with other implementations including the existing per word selection in QTextEdit. Task-number: QTBUG-16283 Reviewed-by: Martin Jones
| * Add missing versioning tests for new QtQuick 1.1 properties/methods.Martin Jones2011-01-315-4/+171
| | | | | | | | | | Task-number: QTBUG-15489 Reviewed-by: Bea Lam
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-01-3025-265/+503
| |\
| * | Use qobject_cast rather than dynamic_cast.Martin Jones2011-01-301-3/+3
| | | | | | | | | | | | | | | | | | To complile on platforms without rtti. Reviewed-by: Michael Brasser
* | | Froze Symbian def files for QtQuick11.juhvu2011-02-019-84/+251
| |/ |/| | | | | Reviewed-by: Martin Jones
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-30335-1595/+14030
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-29335-1595/+14030
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-28335-1594/+14029
| | |\
| | | * expect fail for some PinchArea tests on macBea Lam2011-01-281-0/+15
| | | |
| | | * Allow functions to be passed in as values for grouped propertiesBea Lam2011-01-283-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Fix lineHeight autotests.Yann Bodson2011-01-281-4/+4
| | | |
| | | * Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-288-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamic object in Docs explains QScriptValue argument. SameGame and Dynamic scene now make use of overloadable. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| | | * Adding support for group properties in Component::CreateObject()Christopher Ham2011-01-283-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-281-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
| | | | * Update test, versioning is fixed so expect-fail no longer neededBea Lam2011-01-281-1/+0
| | | | |
| | | | * photoviewer needs QtQuick 1.1 for Image::cacheBea Lam2011-01-281-1/+1
| | | | |
| | | * | Test failure fixed - remove XFAILMartin Jones2011-01-281-2/+0
| | | |/
| | | * disable some pincharea tests on mac temporarilyBea Lam2011-01-281-0/+9
| | | |
| | | * Fix failing test on mac for Qt.applicationBea Lam2011-01-281-0/+4
| | | | | | | | | | | | | | | | setActiveWindow(0) on mac does not deactivate the current application.
| | | * 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-287-6/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2810-12/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2826-24/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-285-11/+32
| | | | | | | | | | | | | | | | Task-number: QTBUG-13849
| | | * Add test for Loader implicitWidth/implicitHeightMartin Jones2011-01-282-0/+46
| | | |
| | | * Don't crash when appending a null itemAaron Kennedy2011-01-273-5/+21
| | | | | | | | | | | | | | | | Task-number: QTBUG-16871
| | | * Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-274-5/+41
| | | |\
| | | | * Test for passing functions to createObject() for property bindingsBea Lam2011-01-272-2/+38
| | | | |
| | | | * 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-2710-17/+148
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15279 Reviewed-by: Michael Brasser
| | | * | Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-2788-4572/+5830
| | | |\ \ | | | | |/
| | | | * Fix righ-to-left support in text components.Christopher Ham2011-01-275-13/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-273-66/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2714-83/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2731-178/+494
| | | | |\
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-2770-4559/+5412
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/graphicsitems/qdeclarativelistview.cpp
| | | * | | | Setting the size of a loader overwrote its implict size.Martin Jones2011-01-274-4/+57
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2731-178/+494
| | | |/ / | | | | | | | | | | | | | | | 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-253-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a more natural ordering, and makes it trivial to control different state groups with pressed and onClicked. Reviewed-by: Martin Jones
generated by cgit v0.12 at 2024-11-12 15:35:11 (GMT)