Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-04-14 | 3 | -6/+12 |
|\ | |||||
| * | Updates to the module documentation | mae | 2010-04-14 | 2 | -4/+10 |
| | | |||||
* | | Add QML documentation for validators | Alan Alpert | 2010-04-14 | 1 | -9/+70 |
|/ | | | | | | | Note that regExp doesn't have a type, and so it is 'documented' as string. Task-number: QTBUG-9412 | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alan Alpert | 2010-04-14 | 4 | -0/+14 |
|\ | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵ | Qt Continuous Integration System | 2010-04-13 | 4 | -0/+14 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits) build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix Safeguard ourselves against corrupt registry values for cleartype gamma fix cetest build properly qdrawhelper: optimize the fetch transformed bilinear functions Compile fix for WinCE Make sure the selectionChanged signal is not called too much ... | ||||
| | * | Fix QT_NO_MOVIE | Tasuku Suzuki | 2010-04-12 | 4 | -0/+14 |
| | | | | | | | | | | | | | | | Merge-request: 2360 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> | ||||
* | | | Reduce warnings at shutdown | Aaron Kennedy | 2010-04-14 | 5 | -2/+30 |
| | | | | | | | | | | | | | | | | | | QTBUG-9799 Reviewed-by: Alexis Menard | ||||
* | | | Image with PreserveAspect enabled with either width or height defined should ↵ | Joona Petrell | 2010-04-14 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | implicitly update the undefined axis to follow the aspect ratio Task-number: Reviewed-by: Martin Jones | ||||
* | | | Reduce warnings at shutdown | Aaron Kennedy | 2010-04-14 | 5 | -9/+10 |
| | | | | | | | | | | | | QTBUG-9799 | ||||
* | | | Fix QT_NO_DESKTOPSERVICES | Tasuku Suzuki | 2010-04-14 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | Merge-request: 2359 Reviewed-by: Alexis Menard <alexis.menard@nokia.com> | ||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alexis Menard | 2010-04-14 | 5 | -5/+16 |
|\ \ \ | |||||
| * | | | Compiled bindings should not print warnings where normal bindings don't | Aaron Kennedy | 2010-04-14 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | QTBUG-9813 | ||||
| * | | | Include qvariant.h as a convenience as context properties | Bea Lam | 2010-04-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | are commonly set and accessed | ||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-14 | 10 | -73/+357 |
| |\ \ \ | |||||
| | * | | | Rename remaining import Qt 4.6 lines to import Qt 4.7 | Joona Petrell | 2010-04-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones | ||||
| * | | | | Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystem | Martin Jones | 2010-04-14 | 2 | -1/+13 |
| | | | | | |||||
* | | | | | Merge branch '4.7' into reviews/2361 | Alexis Menard | 2010-04-14 | 98 | -1225/+2580 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.h | ||||
| * | | | | Bring support of anchors in QML for QGraphicsWidget derived classes. | Alexis Menard | 2010-04-14 | 9 | -72/+356 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add a extension object to bring the anchors property for a QGraphicsWidget. The actual implement uses a separate object for storing the anchor pointer. In the future it would be nice if the extension object is the anchor itself. Also there are two connects extra for QGraphicsWidget one can perhaps disappear with a later commit. Only baseline case is not supported because QGraphicsWidget don't have any concept of baseline. Reviewed-by:akennedy | ||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-14 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-14 | 2 | -6/+6 |
| | |\ \ \ | |||||
| | * | | | | Don't warn on signals emitted after the context has been destroyed | Aaron Kennedy | 2010-04-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9792 | ||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-14 | 2 | -6/+6 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Doc fix. | Michael Brasser | 2010-04-14 | 2 | -6/+6 |
| | |/ / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-14 | 3 | -6/+11 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | emit onMovementStarted/Ended/Changed on wheel events | Martin Jones | 2010-04-14 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9804 | ||||
| | * | | | Complete item creation after its initial properties have been initialized. | Martin Jones | 2010-04-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9800 | ||||
| | * | | | Don't crash when columns == 0 | Martin Jones | 2010-04-14 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9805 | ||||
| * | | | | Give better error messages on plugin load failures. | Warwick Allison | 2010-04-14 | 2 | -15/+31 |
| |/ / / | | | | | | | | | | | | | Fixes reverted commit e0dcdbd2984299665b9b784b201289219b9978d3. | ||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-13 | 2 | -6/+1 |
| |\ \ \ | |||||
| | * | | | Remove warning on ASCII cast | Thiago Macieira | 2010-04-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix compilation on Solaris, AIX and HP-UX. | Thiago Macieira | 2010-04-13 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no bzero function in POSIX. It's a 4.3BSD function, legacy in POSIX.2001 and removed in POSIX.2008. And good compilers will inline the function anyway by a builtin. It's one of the most basic algorithms. Reviewed-by: Trust Me | ||||
| * | | | | Ensure view position is correct for highlight range modes that have a static ↵ | Martin Jones | 2010-04-13 | 2 | -6/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | highlight Task-number: QTBUG-9791 | ||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-13 | 5 | -8/+12 |
| |\ \ \ | |||||
| | * | | | Struct -> class because class is better. | Alexis Menard | 2010-04-13 | 3 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well i have no idea on what to write on that commit message. Reviewed-by:akennedy | ||||
| | * | | | Move effect property where it should be. | Alexis Menard | 2010-04-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by:leo | ||||
| | * | | | Doc fixes | Bea Lam | 2010-04-13 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Fix and test remote root component with qmldir-specified content. | Warwick Allison | 2010-04-13 | 1 | -0/+4 |
| | |/ / | | | | | | | | | | | | | 6ed43975f6733265b8b91b00a9a212076d896ef9 was not correct fix (just invalidated the test) | ||||
| * | | | Improve efficiency of model dataChanged. | Martin Jones | 2010-04-13 | 1 | -7/+8 |
| |/ / | |||||
| * | | doc fixes | Yann Bodson | 2010-04-12 | 1 | -5/+15 |
| | | | |||||
| * | | More error output for QML_IMPORT_TRACE=1 | mae | 2010-04-12 | 1 | -0/+9 |
| | | | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-04-12 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Doc: update Rectangle smooth painting screenshot. | Yann Bodson | 2010-04-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-04-12 | 87 | -1161/+2107 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/graphicsitems/qdeclarativetextinput_p.h | ||||
| | * | | Move documentation code to snippet. | Yann Bodson | 2010-04-12 | 1 | -41/+15 |
| | | | | |||||
| | * | | Fix PathView crash. | Michael Brasser | 2010-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-9753 | ||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-12 | 4 | -5/+331 |
| | |\ \ | |||||
| | | * | | Improve font value type documentation. | Yann Bodson | 2010-04-12 | 3 | -5/+316 |
| | | | | | |||||
| | | * | | Doc fixes | Bea Lam | 2010-04-12 | 1 | -0/+15 |
| | | | | | |||||
| | * | | | Make bindings dump more useful | Aaron Kennedy | 2010-04-12 | 1 | -46/+69 |
| | |/ / | |||||
| | * | | Revert "Better reporting of extension plugin loading errors." | Aaron Kennedy | 2010-04-12 | 1 | -23/+7 |
| | | | | | | | | | | | | | | | | This reverts commit e0dcdbd2984299665b9b784b201289219b9978d3. |