summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-284-13/+73
|\
| * Bunch of doc fixes.Alexis Menard2010-04-284-13/+73
| | | | | | | | | | | | Warnings --. Reviewed-by:TrustMe
* | Alpha needs to be part of rectangle cache key.Martin Jones2010-04-281-4/+6
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2814-330/+503
|\
| * Code cleanupAaron Kennedy2010-04-281-235/+238
| |
| * Remove unused variableAaron Kennedy2010-04-282-4/+1
| |
| * Don't test snippets with C++ componentsBea Lam2010-04-281-0/+2
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-281-29/+43
| |\
| * | Don't unnecessarily regenerate property cacheAaron Kennedy2010-04-286-32/+77
| | | | | | | | | | | | Improves compilation:boomblock benchmark by 22%
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2830-29/+73
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2810-56/+264
| |\ \ \
| * | | | BenchmarkAaron Kennedy2010-04-283-0/+166
| | | | |
| * | | | Small cleanupsAaron Kennedy2010-04-282-59/+19
| | | | |
* | | | | Doc: overview for ImageMartin Jones2010-04-281-1/+21
| |_|_|/ |/| | |
* | | | Share Rectangle pixmap caches between items.Martin Jones2010-04-281-29/+43
| |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2825-19/+19
|\ \ \
| * | | Move snippets to correct locationBea Lam2010-04-2825-19/+19
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-281-1/+1
|\ \ \ \ | |/ / /
| * | | Make compileBea Lam2010-04-281-1/+1
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2810-56/+264
|\ \ \ | |/ /
| * | Doc fixesBea Lam2010-04-287-55/+90
| | |
| * | Delete canvas after use in positioner unit testsJoona Petrell2010-04-281-0/+28
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | Setting conflicting anchors to items inside positioners should print a warningJoona Petrell2010-04-283-1/+146
| |/ | | | | | | | | Task-number: QTBUG-9025 Reviewed-by: Martin Jones
* | Fix snap at view boundaries with overshoot on.Martin Jones2010-04-282-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.7Martin Jones2010-04-2832-361/+2271
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-27107-379/+2939
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (30 commits) Ensure text document is created before we access it. Plugins documentation. Fix update issue when an item has an effect and child. Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints. Disallow "Qt" as namespace import Don't "adjust" the z value of a delegate that has been cached. Correctly inherit extension properties Autotests More QDeclarativeNetworkAccessManagerFactory doc clarification. Fix QDeclarativeNetworkAccessManagerFactory docs. Don't crash on invalid model remove signal. Ensure scheduled layout can occur before testing. Fix remaining 4.6 type registrations (to 4.7). doc anchor margins vs. anchor (line) state/animation. These examples should not be included in this test Unify naming of settings / UI to be "Qt Qml Runtime" Improved error messages for type resolving, new debug option Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-278-15/+152
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: MediaServices; Don't look at the debug info when looking for plugins. Fix attempted invocation of non-existent timerActivated() slot. Fix up qdocs for mediaservices namespace. fix nmake build with win32-msvc2010 Added mkspec for MSVC 2010
| | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-04-2726-126/+160
| | |\ \ | | | | | | | | | | | | | | | into 4.7
| | | * | Fix attempted invocation of non-existent timerActivated() slot.Andrew den Exter2010-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The slot in question was changed to an event handler that emitted a signal. Invoke the signal instead. Task-number: QTBUG-10145 Reviewed-by: Justin McPherson
| | | * | Fix up qdocs for mediaservices namespace.Kurt Korbatits2010-04-271-9/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by:Andrew den Exter
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-275-3/+136
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: fix nmake build with win32-msvc2010 Added mkspec for MSVC 2010
| | * | | | MediaServices; Don't look at the debug info when looking for plugins.Justin McPherson2010-04-271-1/+5
| | | |/ / | | |/| | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-265-3/+136
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: fix nmake build with win32-msvc2010 Added mkspec for MSVC 2010
| | | * | | fix nmake build with win32-msvc2010Joerg Bornemann2010-04-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Petersson
| | | * | | Added mkspec for MSVC 2010Martin Petersson2010-04-262-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Marius SO
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-273-11/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "QDialog: user-moved dialog would not show on the same place after hide"
| | * | | | | Revert "QDialog: user-moved dialog would not show on the same place after hide"Gabriel de Dietrich2010-04-273-11/+11
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 434d2312b63090cfd2ba7e0f3728b5b225bcaeec. This patch was partially wrong and introduced some unwanted effects on KDE and Windows. And it's probably not the righ solution.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2721-335/+2108
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: changes-4.7.0 updated Update Polish translation Cocoa: Native QFileDialog has problems selecting name filter Mac: improve mac native events autotest API Docs Changes to start page. Minor change to Elements doc. See also added to some elements docs.
| | * | | | changes-4.7.0 updatedJoerg Bornemann2010-04-271-0/+25
| | | | | |
| | * | | | Update Polish translationJarek Kobus2010-04-271-316/+2044
| | | | | |
| | * | | | Cocoa: Native QFileDialog has problems selecting name filterRichard Moe Gustavsen2010-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem occured if you told the dialog to not show name filter details, then tried to select a filter specifying those details. The patch makes sure that we accept a filter as found in the drop down list if it matches the specified filter with or without details Task-number: QTBUG-8439 Reviewed-by: msorvig
| | * | | | Mac: improve mac native events autotest APIRichard Moe Gustavsen2010-04-272-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Make it possible to add a delay between two events
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-04-271656-9161/+24745
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Docs Changes to start page. Minor change to Elements doc. See also added to ↵Peter Yard2010-04-2716-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | some elements docs.
* | | | | | Emit hoverChanged appropriately when Item visibility changes.Martin Jones2010-04-282-1/+39
| |_|_|_|/ |/| | | | | | | | | | | | | | Task-number: QTBUG-10243
* | | | | Ensure text document is created before we access it.Martin Jones2010-04-271-0/+1
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-27106-379/+2938
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Plugins documentation. Fix update issue when an item has an effect and child. Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints. Disallow "Qt" as namespace import Don't "adjust" the z value of a delegate that has been cached. Correctly inherit extension properties Autotests More QDeclarativeNetworkAccessManagerFactory doc clarification. Fix QDeclarativeNetworkAccessManagerFactory docs. Don't crash on invalid model remove signal. Ensure scheduled layout can occur before testing. Fix remaining 4.6 type registrations (to 4.7). doc anchor margins vs. anchor (line) state/animation. These examples should not be included in this test Unify naming of settings / UI to be "Qt Qml Runtime" Improved error messages for type resolving, new debug option Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. ...
| * | | | Plugins documentation.Bea Lam2010-04-272-7/+15
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10129
| * | | | Fix update issue when an item has an effect and child.Alexis Menard2010-04-272-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a child marks its parent as dirty (and the parent has an effect) and they are not in a scene, they must not set fullUpdatePending to 1 because if the scene is in fullUpdate (not yet painted) then the item will not be processed by processDirtyItemRecursive so the fullUpdatePending flag will never be reset by resetDirtyItem. Any calls to update() will be then discarded because it will think that a full update is pending for the item. A full update will be done anyway by the scene and if not then markDirty will do its job when the parent will be added to the scene. Task-number:QTBUG-10037 Reviewed-by:bnilsen
| * | | | Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints.Alexis Menard2010-04-275-12/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the echoMode changes for QDeclarativeTextInput we need to update the inputmethod hints. Also in QGraphicsView we need to update the input context installed on the view to make the former is aware of the change. For the input context framework the only way to deal with the current widget is focusWidget(). Unfortunately the widget that has the focus is the QGraphicsView so the input context don't know the real object QGraphicsView is actually focusing. We must keep in sync the inputMethodHints of QGV with the object QGraphicsView is focusing so the input context just called focusWidget()->inputMethodhints() to update itself. Task-number:QTBUG-9922 Reviewed-by:janarve Reviewed-by:bnilsen Reviewed-by:Michael Brasser
generated by cgit v0.12 at 2025-04-17 16:35:53 (GMT)