summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-14157-1131/+2406
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1395-604/+1460
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1385-555/+1391
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (32 commits) Fix autotest on windows Fix worker ListModels to property emit countChanged() Update color type docs to mention transparency Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting Fix alignment bugs in Text element Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0 Compile on WinCE Update QtDeclarative def files Update QtCore def files Compile on MSVC2008 Bug: TextEdit ignores plain text format when pasting text Update sections if model content changes. Fix autotest on windows Test for absent qmldir Allow objectName to be used in QML bindings Install the declarative objectNameChanged callback Don't give focus to a FocusScope that has had focus explicitly cleared. Add a declarative callback for when a QObject's objectName changes Ensure GridView header is visible at the top of the view. Allow aliases to value type properties ...
| | | * Fix autotest on windowsAaron Kennedy2010-10-131-1/+3
| | | |
| | | * Fix worker ListModels to property emit countChanged()Bea Lam2010-10-132-1/+11
| | | | | | | | | | | | | | | | Task-number: QT-4094
| | | * Update color type docs to mention transparencyBea Lam2010-10-131-0/+2
| | | |
| | | * Update reference bitmaps used in bitmap comparison tests to follow changes ↵Joona Petrell2010-10-133-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | in Text painting Task-number: QTBUG-14374
| | | * Fix alignment bugs in Text elementAaron Kennedy2010-10-132-481/+524
| | | | | | | | | | | | | | | | Task-number: QTBUG-14374
| | | * Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0Martin Jones2010-10-131-3/+0
| | | | | | | | | | | | | | | | Task-number: QT-4093
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1378-74/+856
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits) Compile on WinCE Update QtDeclarative def files Update QtCore def files Compile on MSVC2008 Bug: TextEdit ignores plain text format when pasting text Update sections if model content changes. Fix autotest on windows Test for absent qmldir Allow objectName to be used in QML bindings Install the declarative objectNameChanged callback Don't give focus to a FocusScope that has had focus explicitly cleared. Add a declarative callback for when a QObject's objectName changes Ensure GridView header is visible at the top of the view. Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 ...
| | | | * Compile on WinCEAaron Kennedy2010-10-133-6/+6
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1278-74/+856
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits) Update QtDeclarative def files Update QtCore def files Compile on MSVC2008 Bug: TextEdit ignores plain text format when pasting text Update sections if model content changes. Fix autotest on windows Test for absent qmldir Allow objectName to be used in QML bindings Install the declarative objectNameChanged callback Don't give focus to a FocusScope that has had focus explicitly cleared. Add a declarative callback for when a QObject's objectName changes Ensure GridView header is visible at the top of the view. Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 Ensure that onRelease is called for doubleClick events. ...
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1278-74/+856
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits) Update QtDeclarative def files Update QtCore def files Compile on MSVC2008 Bug: TextEdit ignores plain text format when pasting text Update sections if model content changes. Fix autotest on windows Test for absent qmldir Allow objectName to be used in QML bindings Install the declarative objectNameChanged callback Don't give focus to a FocusScope that has had focus explicitly cleared. Add a declarative callback for when a QObject's objectName changes Ensure GridView header is visible at the top of the view. Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 Ensure that onRelease is called for doubleClick events. ...
| | | | | | * Update QtDeclarative def filesJoona Petrell2010-10-122-0/+2
| | | | | | |
| | | | | | * Update QtCore def filesJoona Petrell2010-10-122-0/+2
| | | | | | |
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1274-74/+852
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (23 commits) Compile on MSVC2008 Bug: TextEdit ignores plain text format when pasting text Update sections if model content changes. Fix autotest on windows Test for absent qmldir Allow objectName to be used in QML bindings Install the declarative objectNameChanged callback Don't give focus to a FocusScope that has had focus explicitly cleared. Add a declarative callback for when a QObject's objectName changes Ensure GridView header is visible at the top of the view. Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 Ensure that onRelease is called for doubleClick events. emit currentSectionChanged when section changes in ListView. Remove some unnecessary includes in cpp files ...
| | | | | | | * 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-122-0/+26
| | | | | | | |\
| | | | | | | | * Bug: TextEdit ignores plain text format when pasting textYann Bodson2010-10-122-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1235-66/+393
| | | | | | | |\ \ | | | | | | | | |/
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-1169-71/+752
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix autotest on windows Test for absent qmldir Allow objectName to be used in QML bindings Install the declarative objectNameChanged callback Don't give focus to a FocusScope that has had focus explicitly cleared. Add a declarative callback for when a QObject's objectName changes Ensure GridView header is visible at the top of the view. Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 Ensure that onRelease is called for doubleClick events. emit currentSectionChanged when section changes in ListView. Remove some unnecessary includes in cpp files Ensure Flickable.contentX and Flickable.contentY return correct values. Don't allow multiple values to be assigned to a singular property Fix dragging items within a PathView
| | | | | | | | | * Fix autotest on windowsAaron Kennedy2010-10-112-1/+18
| | | | | | | | | |
| | | | | | | | | * Test for absent qmldirAaron Kennedy2010-10-112-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13051
| | | | | | | | | * Allow objectName to be used in QML bindingsAaron Kennedy2010-10-116-13/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13999
| | | | | | | | | * Install the declarative objectNameChanged callbackAaron Kennedy2010-10-112-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13999
| | | | | | | | | * Don't give focus to a FocusScope that has had focus explicitly cleared.Michael Brasser2010-10-115-7/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If focus was explicitly cleared on a non-visible FocusScope, and then it was made visible, it would incorrectly grab focus. Task-number: QTBUG-13380
| | | | | | | | | * Add a declarative callback for when a QObject's objectName changesAaron Kennedy2010-10-112-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13999 Reviewed-by: Martin Jones
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0956-51/+562
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ensure GridView header is visible at the top of the view. Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 Ensure that onRelease is called for doubleClick events. emit currentSectionChanged when section changes in ListView. Remove some unnecessary includes in cpp files Ensure Flickable.contentX and Flickable.contentY return correct values. Don't allow multiple values to be assigned to a singular property Fix dragging items within a PathView
| | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0956-51/+562
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ensure GridView header is visible at the top of the view. Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 Ensure that onRelease is called for doubleClick events. emit currentSectionChanged when section changes in ListView. Remove some unnecessary includes in cpp files Ensure Flickable.contentX and Flickable.contentY return correct values. Don't allow multiple values to be assigned to a singular property Fix dragging items within a PathView
| | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0856-51/+562
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ensure GridView header is visible at the top of the view. Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 Ensure that onRelease is called for doubleClick events. emit currentSectionChanged when section changes in ListView. Remove some unnecessary includes in cpp files Ensure Flickable.contentX and Flickable.contentY return correct values. Don't allow multiple values to be assigned to a singular property Fix dragging items within a PathView
| | | | | | | * | | | | | Update sections if model content changes.Martin Jones2010-10-125-3/+75
| | | | | | | | |_|_|_|/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0854-508/+931
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0853-50/+487
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Allow aliases to value type properties Image.sourceSize is incorrect after changing Image.source Test for QTBUG-13685 Don't forward keys to invisible items. Disable Text {} image caching by default Check plugin and QML file case on Mac and Windows Add test for QTBUG-14279 Ensure that onRelease is called for doubleClick events. emit currentSectionChanged when section changes in ListView. Remove some unnecessary includes in cpp files Ensure Flickable.contentX and Flickable.contentY return correct values. Don't allow multiple values to be assigned to a singular property Fix dragging items within a PathView
| | | | | | | | | * | | | | Allow aliases to value type propertiesAaron Kennedy2010-10-0815-12/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14254
| | | | | | | | | * | | | | Image.sourceSize is incorrect after changing Image.sourceYann Bodson2010-10-083-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14303
| | | | | | | * | | | | | | Ensure GridView header is visible at the top of the view.Martin Jones2010-10-083-1/+75
| | | | | | | | |/ / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | * | | | | | Test for QTBUG-13685Martin Jones2010-10-082-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13685
| | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-0817-4/+218
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | Disable Text {} image caching by defaultAaron Kennedy2010-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14050
| | | | | | | | * | | | | | Check plugin and QML file case on Mac and WindowsAaron Kennedy2010-10-0816-2/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test should prevent the case where a QML app that is developed on a case insensitive filesystem (like on Mac or Windows) and then run on a case sensitive filesystem (like on Linux) fails to find module plugins, imports and QML files. Task-number: QTBUG-13517
| | | | | | | * | | | | | | Don't forward keys to invisible items.Martin Jones2010-10-081-4/+4
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13685 Reviewed-by: Michael Brasser
| | | | | | | * | | | | | Add test for QTBUG-14279Martin Jones2010-10-082-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14279
| | | | | | | * | | | | | Ensure that onRelease is called for doubleClick events.Martin Jones2010-10-082-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ensures that the pressed property is updated appropriately and the double click and hold is possible. Task-number: QTBUG-14279 Reviewed-by: Michael Brasser
| | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-085-6/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | Remove some unnecessary includes in cpp filesAaron Kennedy2010-10-085-6/+0
| | | | | | | | | | | | | |
| | | | | | | * | | | | | | emit currentSectionChanged when section changes in ListView.Martin Jones2010-10-082-3/+18
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13981 Reviewed-by: Michael Brasser
| | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-087-1/+26
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | Don't allow multiple values to be assigned to a singular propertyAaron Kennedy2010-10-087-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14005
| | | | | | | * | | | | | | Ensure Flickable.contentX and Flickable.contentY return correct values.Martin Jones2010-10-081-2/+2
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The animation value was used previously, but this isn't the actual position of the contentItem. Task-number: QTBUG-13603 Reviewed-by: Michael Brasser
| | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-0757-1056/+2960
| | | | | | | |\ \ \ \ \ \
generated by cgit v0.12 at 2024-09-20 05:33:17 (GMT)