summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix auto test failure.Andrew den Exter2011-02-091-2/+10
| | | | | | | | | | | | | Allow the input context to be reset twice. The context is reset because of two events, the first is because an item lost focus and that reset needs to occur before the focus moves away from the item or events won't be delivered to it. The second redundant reset is because the Qt::WA_InputMethodEnabled flag was cleared on the view widget because no item has focus and it has no way to know the context doesn't need to be reset. Change-Id: Ie3b3fc6898d144ed3f8b3822e49ea0eee7e029f4 Reviewed-by: Martin Jones
* PathView regression: dragging the path didn't update currentIndexMartin Jones2011-02-093-1/+53
| | | | | | | | | | Some refectoring while fixing QTBUG-13687 resulted in the private setOffset() method being called rather than the public. The public version was responsible for updating currentIndex. Change-Id: Iac9c7a19d6fa64550b9498e77b8983512e199370 Task-number: QTBUG-17319 Reviewed-by: Michael Brasser
* Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from ↵Yann Bodson2011-02-095-16/+22
| | | | | | | | | | master. - MultiplyHeight becomes ProportionalHeight - PixelHeight becomes FixedHeight Change-Id: I2a1ebc6ff9db7e62f513919f19773f985b08f8d7 Reviewed-by: Michael Brasser
* Don't clear pre-edit text when a graphics items loses focus.Andrew den Exter2011-02-092-14/+37
| | | | | | | | | | | | | | Don't forceably reset the input method state when a graphics item loses focus, reset the input context and let it handle sending the appropriate events itself. That way behavior is consistent with QWidget and the input context can opt to commit its current pre-edit text instead of discarding it. And don't change the focus until after the input context has been reset or the input method events won't be delivered. Change-Id: Ic545bccab6bf671709c1d06d499217baf614e6f9 Task-number: QTBUG-16997 Reviewed-by: axis
* Support seperate versions of installed modulesmae2011-02-0812-13/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML supports versioned types in modules. There's a version major and a version minor. This makes it possible to have a module com.organisation.fancycomponents with version 1.0, and later you could ship a new module com.organisation.fancycomponents which contains a more recent version 1.1 or 2.0 AND also the old versions to keep old code running. This is good. The problem is that this is difficult with certain QA procedures. It's hard to verify that a new module is indeed 100% compatible with the previous versions. The change extends the import mechanism by adding optional versioning to the component patch. With the patch, you can add a new module com.organisation.fancycomponents.2.0 which will be loaded when the QML file specifies "import com.organisation.fancycomponents 2.0". The patch works as follows: if you try to load com.organisation.fancycomponents in version 2.0, the engine first looks for com/organisation/fancycomponents.2.0, then for com/organisation/fancycomponents.2 then for com.organisation/fancycomponents. Reviewed-by: Aaron Kennedy Task-number: QTBUG-16455
* Autotest to go with 9f8a181a619649c8a227e92f3d16677f4b7cb30aAlan Alpert2011-02-081-0/+4
|
* Scroll TextInput to ensure preedit text is visible.Andrew den Exter2011-02-082-1/+87
| | | | | | | | | | | Update the scroll position on text input events and ensure the end of the pre-edit text is visible, unless that hides the cursor in which case display as much as possible while still displaying the cursor and a preceding pre-edit character. Change-Id: Iec6f82b00333f7c9ea21fe536c8f11be0f8de710 Task-number: QTBUG-16999 Reviewed-by: Martin Jones
* Changing header/footer size during creation caused recusionMartin Jones2011-02-072-4/+8
| | | | | | | | | | | If the size of the header or footer was changed during creation it would trigger itemGeometryChanged() which called updateHeader() and updateFooter() thereby causing recusion. We should only call those methods if the header/footer is already created. Change-Id: Ia2ae4047d745d1f301d243278550e65854fa830a Task-number: QT-4439 Reviewed-by: Joona Petrell
* Ensure section delegates are updated when the section property changes.Martin Jones2011-02-073-0/+119
| | | | | | | | | If the section property changes and the existing section delegate is reused the section property in the delegate must be updated. Change-Id: I6c3dcdb697e80e1ab5162a179da52e0a0f41144c Task-number: QTBUG-17068 Reviewed-by: Bea Lam
* Make test compileBea Lam2011-02-071-2/+2
|
* Disable lineHeight test while implementing the feature in master properly.Yann Bodson2011-02-071-3/+3
|
* Initialize primitives when creating a new QVariantAaron Kennedy2011-02-041-1/+1
| | | | | | Change-Id: Ib9a089a9d912acac4d40c3a1e36e08e86d7832aa Task-number: QTBUG-16683 Reviewed-by: Olivier Goffart
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2011-02-0413-5/+154
|\
| * modelChanged() should not be emitted until view is repopulatedBea Lam2011-02-043-1/+60
| | | | | | | | | | | | | | | | Otherwise, itemAt() returns invalid values at the time that modelChanged() is emitted. Task-number: QTBUG-17156 Reviewed-by: Martin Jones
| * AnimatedImage does not notify on status change.Yann Bodson2011-02-044-3/+61
| | | | | | | | | | Task-number: QTBUG-16520 Reviewed-by: Michael Brasser
| * Clarify case preservation in QDeclarativeImageProvidersAlan Alpert2011-02-042-1/+11
| | | | | | | | | | Task-number: QTBUG-15905 Reviewed-by: Martin Jones
| * Don't accept input methods when a TextEdit or TextInput is read only.Andrew den Exter2011-02-034-0/+22
| | | | | | | | | | | | | | | | | | Neither would open a software input panel or allow text entry while read only, but on Symbian at least the text input mode indicator was still displayed giving the appearance of being able to enter text. Task-number: QT-4497 Reviewed-by: Damian Jansen
* | Allow unknown types to be passed opaquely through signalsAaron Kennedy2011-02-037-6/+140
|/ | | | Task-number: QTBUG-16683
* Correct error messageAaron Kennedy2011-02-031-2/+10
| | | | Task-number: QTBUG-17091
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-02-031-2/+1
|\
| * Correct assertAaron Kennedy2011-02-031-2/+1
| |
* | On windows xp using a higher port makes the declarativedebug* tests workMartin Jones2011-02-032-6/+6
|/ | | | | | I know not why... Reviewed-by: Aaron Kennedy
* Update QDeclarative DEF files for SymbianKalle Juhani Lehtonen2011-02-022-1/+15
| | | | Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-02-023-2/+62
|\
| * Make Flickable's wheel handling more like QAbstractScrollArea.Michael Brasser2011-02-023-2/+62
| | | | | | | | | | | | | | | | Vertical scrolling should only affect vertical movement, and horizontal scrolling should only affect horizontal movement. Task-number: QTBUG-7369 Reviewed-by: Martin Jones
* | Export QDeclarativeRefCount so that symbian compiles.Martin Jones2011-02-021-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-02359-1710/+15273
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (165 commits) Changing header or footer failed to delete the previous. Avoid index-out-of bounds related crash in Grid Move Qt.application docs into Qt global object page Add initial size to ListView in FolderListModel example update What's New for QtQuick 1.1 and AnimatedImage docs Improve docs on Item::visible and Item::opacity Make sure we update Loader size if item size changes after creation. Froze two more symbols and fixed compilation error (QtQuick11). PinchArea sometimes failed. Froze Symbian def files for QtQuick11. Clarify that IntValidator performs locale specific validation. Add a mouseSelectionMode property to TextEdit and TextInput. Add missing versioning tests for new QtQuick 1.1 properties/methods. Use qobject_cast rather than dynamic_cast. 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 ...
| * Changing header or footer failed to delete the previous.Martin Jones2011-02-028-1/+108
| | | | | | | | | | | | | | | | Also ensure that the view is repositioned if the change of header results in the view being out of bounds. Task-number: QTBUG-16522 Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-02-0215-83/+182
| |\
| | * Move Qt.application docs into Qt global object pageBea Lam2011-02-024-61/+69
| | | | | | | | | | | | | | | | | | Previously it was documented as a separate 'Application' element Reviewed-by: Martin Jones
| | * Add initial size to ListView in FolderListModel exampleBea Lam2011-02-022-5/+14
| | | | | | | | | | | | Plus other minor doc changes
| | * update What's New for QtQuick 1.1 and AnimatedImage docsBea Lam2011-02-022-4/+23
| | |
| | * Improve docs on Item::visible and Item::opacityBea Lam2011-02-021-10/+33
| | | | | | | | | | | | Task-number: QTBUG-16973
| | * 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
| * | Avoid index-out-of bounds related crash in GridAlan Alpert2011-02-022-2/+20
| |/ | | | | | | | | Task-number: QTBUG-16959 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
| | | | |
generated by cgit v0.12 at 2025-01-20 22:13:17 (GMT)