summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix inheritance of widget input contexts.Andrew den Exter2011-02-153-4/+50
| | | | | | | | | If a parent widget has an input context assigned return that from QWidget::inputContext() before returning QApplication::inputContext(). Change-Id: I4982a91ace9b7485534f1c31fa4e2d549482640e Task-number: QTBUG-17390 Reviewed-by: axis
* Don't leak ScopeChainNode'sAaron Kennedy2011-02-142-3/+41
| | | | | | | | | | | | | | | | Create a sub-scope of the global scope chain, rather than a completely new scope chain. Leaks are difficult to autotest, but an autotest for QScriptDeclarativeClass::pushCleanContext() was added to ensure its behavior doesn't regress. To reproduce the leak (prior to this change) use: while (true) { QScriptDeclarativeClass::pushCleanContext(&engine); engine.popContext(); } Change-Id: I41ac61ea1664da569eb329c8276f2a0bb6d2f1f7 Task-number: QTBUG-17166 Reviewed-by: Martin Jones
* Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-117-6/+6
| | | | | | | | | On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging' folder, which broke remote debugging of QtDeclarative completely. New name 'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name. Task-number: QTBUG-17360 Reviewed-by: Martin Jones
* Correct the "module not installed" error handlingAaron Kennedy2011-02-1116-13/+285
| | | | | | | | | | | | | | | | | The not installed error will be issued if, after loading plugins and considering the contents of qmldir, there are no elements in the particular minor version. For example, if a plugin/qmldir provides the following types (either from C++ or as QML files specified in the qmldir file): Foo 1.1 Bar 1.3 importing versions 1.0, 1.2, or 1.4 will fail with the not installed error. Change-Id: I8566fda6918cb48936144e67a1ce75add0f160d8 Task-number: QTBUG-17324 Reviewed-by: Martin Jones
* Flickable uses the flick velocity to determine whether to retain grabMartin Jones2011-02-111-1/+6
| | | | | | | | | | | | | Flickable keeps the mouse grab if it was recently flicked and another flick is started before it has settled. However, it is using the velocity of the flick rather than the instantaneous velocity of the view, which causes it to be grabbed unless the view has come to a complete stop. Use smoothedVelocity which is updated during the view movement. Also increase the threshold a little. Change-Id: I970318680d38103468155fa566c489c7874d1b00 Task-number: QTBUG-17383 Reviewed-by: Michael Brasser
* Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-112-3/+15
| | | | | | | | | | | | Was causing assert failure on windows if the 'c:' was lower case, since it was being added to the import path database with a lower case and thus later lookups with an upper case 'c:' would fail. This change fixes the check for whether the path refers to a local path or not. Task-number: QTBUG-16885 Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877 Reviewed-by: Martin Jones
* Report any exceptions occurring in WorkerScript javascript codeBea Lam2011-02-116-3/+139
| | | | | | Task-number: QTBUG-17183 Change-Id: I709cca0bdce247ca9250c4f334654e2ff57b0b32 Reviewed-by: Aaron Kennedy
* MouseArea docs - link to onCanceled() from onReleased()Bea Lam2011-02-111-0/+2
|
* PathView items were not correctly updated when rootIndex changed.Martin Jones2011-02-103-16/+95
| | | | | | | | | | | | | PathView got confused because it queried the model when removing items due to the rootIndex change. This caused new items to be added since the model->count() was not zero (it was the count for the new rootIndex). Calculate the PathView modelCount similarly to the other views (rather than querying the model) and correctly handle the modelCount being set to zero. Change-Id: I9e4fb27c14aa8c77ad37ff01d95c123f909db20d Task-number: QTBUG-16366 Reviewed-by: Bea Lam
* Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-1023-0/+6891
| | | | | | | | | | Set keepMouseGrabs to true when the selectByMouse property is enabled to prevent flickable from stealing the mouse grab and interrupting a selection. Change-Id: I08e11265ab9c55d239fd09aceef4fdb8e74aba9d Task-number: QTBUG-16956 Reviewed-by: Martin Jones
* Update modules-related tests and docsBea Lam2011-02-108-73/+210
| | | | | | | Added tests for remote imports and fixed/improved examples and text in the docs. Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7
* CLeanup registers after AddStringAaron Kennedy2011-02-101-3/+38
| | | | | Reviewed-by: Martin Jones Change-Id: I7bd2806770fe5b86fbc589644107d74981d32abe
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2011-02-0930-51/+642
|\ | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro Change-Id: I8da521f05ebc266d91caa582852155b571d5cc63
| * 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
* | Fix docs for variant and list basic typesBea Lam2011-02-091-99/+84
| | | | | | | | | | | | | | | | Make it clear that QML properties never store JavaScript object data, and that inefficient serialization must be performed when JavaScript objects are copied to QML properties. Task-number: QTBUG-16624
* | Add test for importing plugins that contain QML filesBea Lam2011-02-097-1/+91
| |
* | Call onAdd() for first items added to ListView and GridViewBea Lam2011-02-096-57/+340
|/ | | | | | | | | | | | The bug was caused by the fact that the itemsInserted() implementation in ListView and GridView returned early for cases where (model->count() <= 1) and so did not call onAdd() unlike for other cases. This change also fixes some incorrect values in the header() and footer() unit tests for ListView and GridView. Change-Id: I24f5c86afcd62c26e17b0932f257f4767a287b8e Task-number: QTBUG-15642 Reviewed-by: Martin Jones
* 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
generated by cgit v0.12 at 2025-01-09 07:59:45 (GMT)