Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify QDeclarativeGuard logic | Aaron Kennedy | 2010-04-29 | 2 | -12/+10 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-29 | 13 | -247/+170 |
|\ | |||||
| * | Update the input method sensitivity in case of complex widgets in ↵ | Alexis Menard | 2010-04-29 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | QGraphicsProxyWidget. In case of a complex widget embedded in a proxy, we need to update the input method acceptance whenever the focus changes inside the proxy. Task-number:QTBUG-8847 Reviewed-by:janarve | ||||
| * | Mark some properties in QDeclarativeItem as private properties. | Alexis Menard | 2010-04-29 | 5 | -178/+114 |
| | | | | | | | | | | | | | | QDeclarativeItem will be public, all properties that are relaying on private types must be private too. Reviewed-by:akennedy | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-29 | 1 | -0/+2 |
| |\ | |||||
| | * | Update QmlChanges.txt | Bea Lam | 2010-04-29 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-29 | 4 | -60/+7 |
| |\ \ | | |/ | |||||
| | * | Don't call qRegisterMetaType() in global scope | Bea Lam | 2010-04-29 | 2 | -1/+1 |
| | | | |||||
| | * | Remove Component's isReady, isLoading, isError and isNull properties. | Bea Lam | 2010-04-29 | 2 | -58/+5 |
| | | | | | | | | | | | | | | | | | | | | | The Component status enum covers all of these properties already and removing these also makes the API consistent with Image and Loader. Note this change only affects the QML Component API; the methods are still available for QDeclarativeComponent. | ||||
| | * | Return enum property values as numbers, not QVariant values | Bea Lam | 2010-04-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Task-number: QTBUG-10291 Reviewed-by: akennedy | ||||
| * | | Ensure filenames are correctly resolved | Warwick Allison | 2010-04-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Works around QUrl("file:a").isRelative() being false. Reviewed-by: Aaron Kennedy | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-29 | 16 | -922/+1149 |
| |\ \ | | |/ | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-29 | 8 | -6/+42 |
| |\ \ | |||||
| * | | | Stricter (but controllable) error reporting on Connections signal-name ↵ | Warwick Allison | 2010-04-29 | 2 | -8/+40 |
| | | | | | | | | | | | | | | | | error. And test. | ||||
* | | | | Doc: some simple examples of sourceSize usage. | Martin Jones | 2010-04-29 | 1 | -0/+26 |
| |_|/ |/| | | | | | | | | Task-number: QTBUG-10252 | ||||
* | | | Fix typo in qdeclarativeitem's doc | Leonardo Sobral Cunha | 2010-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | Fix path view update on startX(Y) changes in qml | Leonardo Sobral Cunha | 2010-04-29 | 3 | -1/+16 |
| | | | | | | | | | | | | | | | Task-number: QTBUG-10290 Reviewed-by: Michael Brasser | ||||
* | | | Suppress transient errors from bindings | Aaron Kennedy | 2010-04-29 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | If a binding generates > 1 transient error, only the first was being suppressed. QTBUG-10274 | ||||
* | | | Cleanup: Move import stuff out of the QDeclarativeEngine | Aaron Kennedy | 2010-04-29 | 11 | -919/+1129 |
| |/ |/| | |||||
* | | Prevent Behavior from being triggered on initialization. | Michael Brasser | 2010-04-29 | 6 | -2/+38 |
| | | | | | | | | | | | | | | | | Add an additional private notification mechanism that is triggered after all QDeclarativeParserStatus items have had their componentComplete called. Task-number: QTBUG-6332 | ||||
* | | Doc: Qt.MidButton -> Qt.MiddleButton | Martin Jones | 2010-04-28 | 2 | -4/+4 |
|/ | |||||
* | Compile on OSX, hopefully. | Martin Jones | 2010-04-28 | 1 | -0/+1 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-28 | 25 | -445/+703 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (21 commits) Improve border image documentation. Update border image examples. Doc - micro fix. Fix QML default property HTML generation... again. Alpha needs to be part of rectangle cache key. Bunch of doc fixes. Doc: overview for Image Code cleanup Remove unused variable Don't test snippets with C++ components Don't unnecessarily regenerate property cache Share Rectangle pixmap caches between items. Move snippets to correct location Make compile Benchmark Small cleanups Fix snap at view boundaries with overshoot on. Doc fixes Emit hoverChanged appropriately when Item visibility changes. Delete canvas after use in positioner unit tests ... | ||||
| * | Improve border image documentation. | Yann Bodson | 2010-04-28 | 1 | -11/+23 |
| | | |||||
| * | Doc - micro fix. | Martin Jones | 2010-04-28 | 1 | -1/+0 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-28 | 4 | -13/+73 |
| |\ | |||||
| | * | Bunch of doc fixes. | Alexis Menard | 2010-04-28 | 4 | -13/+73 |
| | | | | | | | | | | | | | | | | | | Warnings --. Reviewed-by:TrustMe | ||||
| * | | Alpha needs to be part of rectangle cache key. | Martin Jones | 2010-04-28 | 1 | -4/+6 |
| |/ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-28 | 9 | -327/+334 |
| |\ | |||||
| | * | Code cleanup | Aaron Kennedy | 2010-04-28 | 1 | -235/+238 |
| | | | |||||
| | * | Remove unused variable | Aaron Kennedy | 2010-04-28 | 2 | -4/+1 |
| | | | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-28 | 1 | -29/+43 |
| | |\ | |||||
| | * | | Don't unnecessarily regenerate property cache | Aaron Kennedy | 2010-04-28 | 5 | -29/+76 |
| | | | | | | | | | | | | | | | | Improves compilation:boomblock benchmark by 22% | ||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-28 | 5 | -10/+54 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-28 | 8 | -53/+153 |
| | |\ \ \ | |||||
| | * | | | | Small cleanups | Aaron Kennedy | 2010-04-28 | 2 | -59/+19 |
| | | | | | | |||||
| * | | | | | Doc: overview for Image | Martin Jones | 2010-04-28 | 1 | -1/+21 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Share Rectangle pixmap caches between items. | Martin Jones | 2010-04-28 | 1 | -29/+43 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-28 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Make compile | Bea Lam | 2010-04-28 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-28 | 8 | -53/+153 |
| |\ \ \ | | |/ / | |||||
| | * | | Doc fixes | Bea Lam | 2010-04-28 | 6 | -52/+79 |
| | | | | |||||
| | * | | Setting conflicting anchors to items inside positioners should print a warning | Joona Petrell | 2010-04-28 | 2 | -1/+74 |
| | |/ | | | | | | | | | | | | | Task-number: QTBUG-9025 Reviewed-by: Martin Jones | ||||
| * | | Fix snap at view boundaries with overshoot on. | Martin Jones | 2010-04-28 | 2 | -8/+14 |
| | | | | | | | | | | | | | | | The view would flick slowly at the boundaries if overshoot and snapping was enabled. | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-28 | 20 | -29/+50 |
| |\ \ | | |/ | |||||
| * | | Emit hoverChanged appropriately when Item visibility changes. | Martin Jones | 2010-04-28 | 2 | -1/+39 |
| | | | | | | | | | | | | Task-number: QTBUG-10243 | ||||
* | | | Fix compatibility with Qt Mobility. | Aaron McCarthy | 2010-04-28 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | Applications which are built against Qt 4.7 but choose to use the bearer management module from Qt Mobility do not get to set/get the network configuration used by QNAM. | ||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2010-04-27 | 13 | -14/+241 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation with QT_NO_TEXTSTREAM Fix the compilation with QT_NO_TOOLTIP Add unit tests for a number of QList methods. Crash while dragging on Mac OS X (Cocoa) Doc & menubar hidden for QtDemo after switching back from fullscreen qdoc: Added breadcrumbs for class pages. QTabWidget documentMode not working correctly on Mac qdoc: Removed MacRefs for Xcode documentation stuff. Slight QList documentation fix. | ||||
| * | | Fix compilation with QT_NO_TEXTSTREAM | Tasuku Suzuki | 2010-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Merge-request: 582 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> | ||||
| * | | Fix the compilation with QT_NO_TOOLTIP | Tasuku Suzuki | 2010-04-27 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | Merge-request: 579 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> |