summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix Flipable docsBea Lam2010-10-221-13/+14
| | | | Task-number: QTBUG-13789
* Remove unnecessary roundingAlan Alpert2010-10-211-2/+0
| | | | Task-number: QTBUG-13995
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-211-2/+3
|\
| * Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-211-2/+3
| | | | | | | | | | Task-number: QT-3957 reviewed-by: Aaron Kennedy
* | Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-212-9/+27
|/ | | | | | | | Since all animation is reset when changing contentX or contentY the appropriate moving properties should be false. Task-number: QTBUG-14583 Reviewed-by: Michael Brasser
* Ensure we don't refill the view before all model changes are complete.Martin Jones2010-10-202-21/+27
| | | | | | | | | Calling setPosition(0) in itemsRemoved caused the view to be refilled, which is a bad thing if the model has changed but not all updates have been handled. Fixed in both ListView and GridView. Task-number: QTBUG-14548 Reviewed-by: Michael Brasser
* ListView item insertion didn't handle delayed item removal correctly.Martin Jones2010-10-201-30/+4
| | | | | | | | | The delayed removal items weren't handled correctly by mapRangeFromModel() function. Use mapFromModel() instead which gives us what we actually want and remove unused mapRangeFromModel(). Task-number: QTBUG-14471 Reviewed-by: Michael Brasser
* Fix position of synthesized semicolon tokens.Aaron Kennedy2010-10-201-6/+9
| | | | | Authored-by: Roberto Raggi Reviewed-by: Aaron Kennedy
* Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-1931-88/+127
| | | | | Task-number: QTBUG-14041 Reviewed-by: Aaron Kennedy
* Call the correct vme meta object when connecting alias signalsAaron Kennedy2010-10-191-1/+1
| | | | Task-number: QTCREATORBUG-2769
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-195-43/+56
|\ | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix QDeclarativeTextLayout under non-affine transformation Fix visual tests. ListView.visibleArea.heightRatio should not emit a signal when it does not change. Properties should have precedence over methods.
| * Fix QDeclarativeTextLayout under non-affine transformationAaron Kennedy2010-10-181-1/+1
| | | | | | | | Task-number: QT-4158
| * ListView.visibleArea.heightRatio should not emit a signal when it does not ↵Yann Bodson2010-10-183-13/+26
| | | | | | | | | | | | | | change. Task-number: QTBUG-14492 Reviewed-by: Michael Brasser
| * Properties should have precedence over methods.Michael Brasser2010-10-181-29/+29
| | | | | | | | | | | | | | Fixes regression introduced by recent changes to the property cache. Task-Number: QTBUG-14500 Reviewed-by: Aaron Kennedy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-1815-181/+470
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-152-30/+34
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) Fix autotest failure caused by commit 92365268 Cleanup changelog for 4.7.1. QNAM: Do not need QNetworkSession for data:// Workaround for QFileSystemWatcher regression Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-142-30/+34
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-132-30/+34
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-0718-49/+176
| | | | |\
| * | | | | Allow overloaded methods, and methods with default params, to be called in QMLAaron Kennedy2010-10-153-21/+317
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11604
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-10-151-3/+5
| |\ \ \ \ \
| | * | | | | Actually call update in the Text ElementAlan Alpert2010-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14469 Reviewed-by: Aaron Kennedy
| | * | | | | Recalculate Text Element's alignment when width changesAlan Alpert2010-10-151-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14463 Reviewed-by: Aaron Kennedy
| * | | | | | Fix potential memory corruption in QDeclarativePropertyCacheAaron Kennedy2010-10-141-4/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14449
| * | | | | Correctly splice properties from derived metaobjects togetherAaron Kennedy2010-10-142-58/+28
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14449
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-1413-547/+577
| |\ \ \ \ \
| | * | | | | Optimization: Don't generate intermediate QDeclarativeComponent'sAaron Kennedy2010-10-148-64/+48
| | |/ / / /
| * | | | | Fix consistency of setting currentIndex in ListView and GridView.Martin Jones2010-10-142-34/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behaviour of setting the currentIndex out of bounds, was different depending upon whether it was set -ve, beyond the end, or before component completed. The behaviour is now consistent - setting the currentIndex out of bounds is allowed and will cause the currentItem and highlightItem to become null. Task-number: QTBUG-12571 Reviewed-by: Michael Brasser
* | | | | | Corrected spelling mistake and whitespace fixes.Jerome Pasion2010-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14501
* | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-141-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | TextInput autoscroll now scrolls when the cursor movesAlan Alpert2010-10-141-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Previously needed some actual text changes to scroll, which is incorrect Task-number: QTBUG-14230
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1329-541/+844
|\ \ \ \ \ | |/ / / /
| * | | | Fix autotest on windowsAaron Kennedy2010-10-131-1/+3
| | | | |
| * | | | Fix worker ListModels to property emit countChanged()Bea Lam2010-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QT-4094
| * | | | Fix alignment bugs in Text elementAaron Kennedy2010-10-132-481/+524
| |/ / / | | | | | | | | | | | | Task-number: QTBUG-14374
| * | | Compile on WinCEAaron Kennedy2010-10-131-2/+2
| | | |
| * | | Compile on MSVC2008Aaron Kennedy2010-10-121-3/+2
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-121-0/+1
| |\ \ \
| | * | | Bug: TextEdit ignores plain text format when pasting textYann Bodson2010-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14003 Reviewed-by: Michael Brasser
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-124-13/+84
| |\ \ \ \ | | |/ / /
| | * | | Fix autotest on windowsAaron Kennedy2010-10-111-0/+12
| | | | |
| | * | | Allow objectName to be used in QML bindingsAaron Kennedy2010-10-114-13/+66
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13999
| | * | | Install the declarative objectNameChanged callbackAaron Kennedy2010-10-112-0/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13999
| * | | | Update sections if model content changes.Martin Jones2010-10-124-3/+64
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | We didn't handle the section property changing, e.g. due to asynchronous model. Task-number: QT-4093 Reviewed-by: Aaron Kennedy
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-085-15/+71
| |\ \ \
| | * | | Allow aliases to value type propertiesAaron Kennedy2010-10-083-9/+62
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14254
| | * | | Image.sourceSize is incorrect after changing Image.sourceYann Bodson2010-10-082-6/+9
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14303
| * | | | Ensure GridView header is visible at the top of the view.Martin Jones2010-10-081-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The view was scrolled to the top of the first item, rather than the top of the header. Task-number: QTBUG-13906 Reviewed-by: Michael Brasser
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-085-3/+59
| |\ \ \
| | * | | Disable Text {} image caching by defaultAaron Kennedy2010-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14050