summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update QtOpenVg def files for bug QT-3589Joona Petrell2010-11-082-0/+2
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-06231-4185/+9768
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Image bounding rect should always include the area being painted Fix minehunt.pro (minehunt is no longer a plugin) Don't allow flagging of flipped tiles in Minehunt Remove Snake demo from QtDemo Fix samegame text input focus Whitespace fixes Update visual tests for Mac. Run all QML visual tests now. Make qmlvisual tests more stable Add documentation about script evaluation context and allowed types Maintain passing visualtests on X11 Fix errors in example code. Also reverts the example code to the old Largely rewrite the Using QML in C++ Applications documentation. It Document list type operations Fix regression in 648eb76c and update visual tests. Don't emit xChanged()/yChanged() twice. Add testcase for QTBUG-13719. Doc fix highlightranges.qml example and visual test contained binding loop. Combining ListView.StrictlyEnforceRange and resizing currentItem stalls. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-05231-4185/+9768
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Image bounding rect should always include the area being painted Fix minehunt.pro (minehunt is no longer a plugin) Don't allow flagging of flipped tiles in Minehunt Remove Snake demo from QtDemo Fix samegame text input focus Whitespace fixes Update visual tests for Mac. Run all QML visual tests now. Make qmlvisual tests more stable Add documentation about script evaluation context and allowed types Maintain passing visualtests on X11 Fix errors in example code. Also reverts the example code to the old Largely rewrite the Using QML in C++ Applications documentation. It Document list type operations Fix regression in 648eb76c and update visual tests. Don't emit xChanged()/yChanged() twice. Add testcase for QTBUG-13719. Doc fix highlightranges.qml example and visual test contained binding loop. Combining ListView.StrictlyEnforceRange and resizing currentItem stalls. ...
| | * Image bounding rect should always include the area being paintedJoona Petrell2010-11-054-3/+99
| | | | | | | | | | | | | | | | | | | | | | | | This didn't always happend with fillMode PreserveAspectCrop, resulting in drawing artifacts. Task-number: QT-3933 Reviewed-by: Martin Jones
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-051-2/+1
| | |\
| | | * Fix minehunt.pro (minehunt is no longer a plugin)Bea Lam2010-11-051-2/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15011 Reviewed-by: Martin Jones
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0513-333/+363
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-05224-4169/+9660
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update visual tests for Mac. Run all QML visual tests now. Make qmlvisual tests more stable Add documentation about script evaluation context and allowed types Maintain passing visualtests on X11 Fix errors in example code. Also reverts the example code to the old Largely rewrite the Using QML in C++ Applications documentation. It Document list type operations Fix regression in 648eb76c and update visual tests. Don't emit xChanged()/yChanged() twice. Add testcase for QTBUG-13719. Doc fix highlightranges.qml example and visual test contained binding loop. Combining ListView.StrictlyEnforceRange and resizing currentItem stalls. Regression: QDeclarativeText does not update when text turns empty Qml Debugging: Only enable if explicitly requested Regression: Text element breaks when using \n for separating lines Removing a binding while it is being applied caused a crash.
| | * | | Don't allow flagging of flipped tiles in MinehuntAlan Alpert2010-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4249
| | * | | Remove Snake demo from QtDemoAlan Alpert2010-11-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snake now uses the runtime property, which we don't have in QtDemo. Task-number: QTBUG-15048
| | * | | Fix samegame text input focusAlan Alpert2010-11-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The real problem is QTBUG-15047, but by implementing SameGame in a different way it gets worked around very nicely. Task-number: QTBUG-14716
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0461-3168/+2776
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Update visual tests for Mac.Yann Bodson2010-11-0461-3168/+2776
| | | | |
| | * | | Whitespace fixesAlan Alpert2010-11-043-14/+14
| | |/ / | | | | | | | | | | | | | | | | Supposed to be in the last commit - not really helpful if the filter says something is wrong but pushes it anyways.
| | * | Run all QML visual tests now.Alan Alpert2010-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | They all pass for me, and running them through CI will help find the unstable ones.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0421-77/+253
| | |\ \
| | | * | Add documentation about script evaluation context and allowed typesBea Lam2010-11-041-2/+28
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14919
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-04115-843/+5708
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix errors in example code. Also reverts the example code to the old Largely rewrite the Using QML in C++ Applications documentation. It Document list type operations Fix regression in 648eb76c and update visual tests. Don't emit xChanged()/yChanged() twice. Add testcase for QTBUG-13719. highlightranges.qml example and visual test contained binding loop. Combining ListView.StrictlyEnforceRange and resizing currentItem stalls. Regression: QDeclarativeText does not update when text turns empty Qml Debugging: Only enable if explicitly requested Regression: Text element breaks when using \n for separating lines Removing a binding while it is being applied caused a crash.
| | * | | | Make qmlvisual tests more stableAlan Alpert2010-11-0441-611/+677
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text elements now use shared components that have the same default values, instead of using the system defaults (that can vary between computers). This also removes text edit/input cursor blinking. Task-number: QTBUG-14792
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0455-397/+2087
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix errors in example code. Also reverts the example code to the oldBea Lam2010-11-043-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list format. Task-number: QTBUG-14871
| | | * | | Largely rewrite the Using QML in C++ Applications documentation. ItBea Lam2010-11-0450-369/+1973
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now has an overview of different approaches to QML/C++ integration and demonstrates how to pass data between QML and C++ through properties/functions/signals. The part in the old docs that focused on QDeclarativeContext has been merged into the QDeclarativeContext class docs (although most of the info was largely covered in there already) and the part that covered Network Components has been moved to the QDeclarativeComponent class docs. The custom enum types example previously in extending-tutorial.qdoc has been moved to these new docs. Task-number: QTBUG-14923
| | | * | | Document list type operationsBea Lam2010-11-042-7/+87
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14645
| | * | | | Maintain passing visualtests on X11Alan Alpert2010-11-0410-3/+925
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | springanimation/follow.qml has had updated visuals, unknown cause. the text tests were committed without an actual testcase, now added the 'skip' property has now been documented in the tst_qmlvisual help Task-number: QTBUG-14792
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0422-373/+412
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix regression in 648eb76c and update visual tests.Martin Jones2010-11-0417-369/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once fixup() begins, flick should not be recalculated. Task-number: QTBUG-14821 Reviewed-by: Michael Brasser
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-043-0/+32
| | | |\ \ \
| | | | * | | Add testcase for QTBUG-13719.Michael Brasser2010-11-043-0/+32
| | | | | | |
| | | * | | | Don't emit xChanged()/yChanged() twice.Martin Jones2010-11-042-4/+10
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once from QGraphicsObject (QGraphicsItemPrivate::setPosHelper()) and once from QDeclarativeItem::geometryChanged(). Remove from geometryChanged(). Task-number: QTBUG-14942 Reviewed-by: Michael Brasser
| | * | | | Doc fixAlan Alpert2010-11-041-1/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The associated bug report is invalid, but this doc fix helps people understand why (so that they never mistakenly file it again). Task-number: QTBUG-14950
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0340-88/+3224
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: highlightranges.qml example and visual test contained binding loop. Combining ListView.StrictlyEnforceRange and resizing currentItem stalls. Regression: QDeclarativeText does not update when text turns empty Qml Debugging: Only enable if explicitly requested Regression: Text element breaks when using \n for separating lines Removing a binding while it is being applied caused a crash.
| | | * | | highlightranges.qml example and visual test contained binding loop.Martin Jones2010-11-032-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, the currentIndex stayed -1 since the views all bound to each others currentIndex, which starts as -1. Task-number: QTBUG-14794 Reviewed-by: Yann Bodson
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-0321-16/+965
| | | |\ \ \
| | | | * | | Regression: QDeclarativeText does not update when text turns emptyYann Bodson2010-11-037-0/+751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14865 Reviewed-by: Michael Brasser
| | | | * | | Qml Debugging: Only enable if explicitly requestedKai Koehne2010-11-0212-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the remote debugging of QDeclarativeEngines only after QDeclarativeDebugHelper::enableDebugging() has been called. Approved by 4.7 Program Team. Reviewed-by: Alessandro Portale Task-number: QTBUG-13762
| | | | * | | Regression: Text element breaks when using \n for separating linesYann Bodson2010-11-023-12/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14915 Reviewed-by: Michael Brasser
| | | * | | | Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.Martin Jones2010-11-0311-43/+2181
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two problems. 1) layout() called fixup() was called while the view was being flicked. 2) the snapping code was incorrect (and duplicated). Task-number: QTBUG-14821 Reviewed-by: Michael Brasser
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-028-81/+376
| | | |\ \ \
| | | * | | | Removing a binding while it is being applied caused a crash.Martin Jones2010-11-026-16/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a weak pointer to the binding in case applying the binding (while fast forwarding) causes it to be removed. Task-number: QTBUG-14830 Reviewed-by: Michael Brasser
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-051-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Hide the cursor in the tested text edit
| * | | | | | | Hide the cursor in the tested text editHarald Fernengel2010-11-051-2/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hiding the cursor will make the image comparison more robust. This fixes the sporadic test fail we saw on some machines - every time the blinking cursor was visible, the test failed. Reviewed-by: Robert Griebl
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-051-0/+81
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute tst_qnetworkreply: One more HTTP test using setReadBufferSize()
| * | | | | | tst_qnetworkreply: New HTTP test with AuthenticationReuseAttributeMarkus Goetz2010-11-051-0/+29
| | | | | | |
| * | | | | | tst_qnetworkreply: One more HTTP test using setReadBufferSize()Markus Goetz2010-11-051-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13431
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0546-221/+623
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits) Give the toplevel widget a layout fix tests when using Qt in a namespace Fix tst_symbols auto test trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget ...
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0446-221/+623
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits) Give the toplevel widget a layout fix tests when using Qt in a namespace Fix tst_symbols auto test trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget ...
| | * | | | | | Give the toplevel widget a layoutHarald Fernengel2010-11-041-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the top-level will be large enough to view the text edit.
| | * | | | | | fix tests when using Qt in a namespaceHarald Fernengel2010-11-041-0/+2
| | | | | | | |
| | * | | | | | Fix tst_symbols auto testHarald Fernengel2010-11-043-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix isLikelyToBeNfs with a "q", even though it's only autotest-exported.
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0445-220/+613
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits) trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget Fixed QMenu autotest to use a dummy toplevel widget Fixed QMenuBar autotest. Added mainwindow activation Fixed QString autotest when QT_QLOCALE_USES_FCVT is set ...