summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-242-1/+4
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarativeDebug: Fix autotest Pass QList as const reference when possible Fixed crashes in Observer mode related to infinite bounding rects Doc QmlDirParser: Fix typeInfo accessor.
| | | | | * | | | | | | Merge remote branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-05-232-1/+4
| | | | | |\ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed inconsistent behaviour in Qt.rect().Kim Motoyoshi Kalland2011-05-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QML function Qt.rect() used to return a null rectangle if the width or height argument were negative. This was inconsistent with Qt.size() and parsing a string of the type "x,y,wxh" which do not check the width and height. Reviewed-by: Samuel
| | * | | | | | | | | | | Undo accidental breakage.David Boddie2011-05-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Undo breakage caused by 3abaecc3aec4e46f1c5969c33875fd45aa542385. Reviewed-by: Kai Koehne
| | * | | | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-24324-5534/+5579
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| | * | | | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-1625-50/+1620
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-113-11/+57
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into ↵David Boddie2011-05-055-2/+133
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1220
| | * | | | | | | | | | | | Doc: Fixed incorrect inline snippet for an example .sci file.David Boddie2011-05-041-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18812 (cherry picked from commit 4e8672c87bd7e740b01ca29a2a3c8ba902ed664b)
| | * | | | | | | | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
| * | | | | | | | | | | | | Don't release register prematurelyAaron Kennedy2011-08-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20648
| * | | | | | | | | | | | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-011-91/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-20629 reports a crash on destruction of XmlListModel when cleaning up the global static for the QDeclarativeXmlQuery object. The fix restructures the internals to be like the threading structure used for QDeclarativePixmapReader which doesn't use a global static. Task-number: QTBUG-20629 Reviewed-by: Martin Jones
| * | | | | | | | | | | | | Compile in namespaceAaron Kennedy2011-07-291-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix alias warnings in QML compiled bindingsAaron Kennedy2011-07-291-9/+17
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix alias warnings in MetaCallArgumentAaron Kennedy2011-07-291-49/+65
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix alias warnings in QDeclarativeVMEAaron Kennedy2011-07-292-32/+72
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix alias warnings in QDeclarativeGuardAaron Kennedy2011-07-294-55/+88
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | QmlInspector: Remove unused toolbarKai Koehne2011-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got disabled ages ago, but we never cleaned up the sources. Change-Id: I69e7e5a431e2092ef925e48f81a306a3d316d2c7
* | | | | | | | | | | | | JSDebugger: Only hit breakpoints in user codeKai Koehne2011-08-101-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the topmost stack entry is a user defined ScriptFunction. This avoids hitting the anonymous functions used for bindings, e.g. onClicked: Qt.quit() leads to script code (function onClicked() { Qt.quit(); }) which will be hit twice for the debugger: Once for the function call itself, then for the execution of Qt.quit(). Change-Id: Id431cacaef84172dc3474018cdf61f3dcc05cf93
* | | | | | | | | | | | | Prevent Binding from crashing when its target object is deleted.Michael Brasser2011-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic83cfcaeccf6639976864bb2f38f5bcff16e2b11 Task-number: QTBUG-20692 Reviewed-by: Martin Jones
* | | | | | | | | | | | | Fix crash when assigning a list property to transitions.Michael Brasser2011-07-261-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the crash, but doesn't actually assign any Transitions (the transitions list will now be empty, rather than contain a null Transition object). Correct assignment is a general language issue, and will be fixed separately. Change-Id: I6aaba4eaf6faa513e54d99b27fe9f9a705eea40b Task-number: QTBUG-20227 Reviewed-by: Alan Alpert
* | | | | | | | | | | | | Qml Debugging: only read properties that can be displayed in the debuggerChristiaan Janssen2011-07-202-7/+8
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68a6636aae271924bcec31ce7ad76c01fc43080b Task-number: QTCREATORBUG-5075
* | | | | | | | | | | | Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-044-149/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the response of the views when SnapOneItem/Row is enabled. In this case it is best to be much more reactive to the user input since even a small movement in a particular direction indicates a change to the next/previous item. Change-Id: I6a8eb689c3b12cdc67f24106032e36bba82d2846 Task-number: QTBUG-19874 Reviewed-by: Bea Lam
* | | | | | | | | | | | Flickable is too sensitive.Martin Jones2011-06-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drag, stop, release should result in a pan, which does not trigger a flick. The current flick threshold velocity is too low, leading to flicks when a pan gesture is more desireable. Change-Id: I3aa3bf28cc0ccbb043f3390ff4e044ea587ba3ff Task-number: QTBUG-19933 Reviewed-by: Bea Lam
* | | | | | | | | | | | Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-06-281-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the smoothed velocity is set at the start of the flick. Ensure that the smoothed velocity animation isn't restarted unless there is new valid data. Change-Id: I00f8bbf1fe91faeea752b093c4658ad0f53ad06d Task-number: QTBUG-19676 Reviewed-by: Bea Lam
* | | | | | | | | | | | QDeclarativeDebug: Add code coverage informationKai Koehne2011-06-224-7/+124
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add messages to track the lines of JavaScript that are executed. Patch done by Janne Virranmaki <ext-janne.1.virranmaki@nokia.com> Reviewed-by: kkoehne
* | | | | | | | | | | Fix QDeclarativeInspector when starting with ,blockAurindam Jana2011-06-212-2/+14
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3797567f22f61abf59ec5332ebc74b3fa37ede93 Reviewed-by: kkoehne
* | | | | | | | | | QDeclarativeDebug: Fix cases where multiple packets arrive in one goKai Koehne2011-06-201-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure no packets get 'lost' when they're arriving in one go through the TCP/IP socket. Reviewed-by: Christiaan Janssen
* | | | | | | | | | Rewrite autotests for js debuggingAurindam Jana2011-06-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5cb0e53ceab136bfe7c53a3d6c51c8865b76761b Reviewed-by: kkoehne
* | | | | | | | | | Create property cache in case of Component{} rootAaron Kennedy2011-06-101-0/+6
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36f969d09d8ce5e0b68b657b514586990e88ebe4 Task-number: QTBUG-19354
* | | | | | | | | QDeclarativeDebug: Don't hang if started with ',block' argumentKai Koehne2011-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced in a59261454071 Reviewed-by: Christiaan Janssen
* | | | | | | | | QDeclarativeDebug: Fix QJSDebugService if launched with ',block'Kai Koehne2011-06-083-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the debugger is launched in blocking mode the service will be enabled from the start. Reviewed-by: Thorbjorn Lindeijer
* | | | | | | | | Fix docs on caching for images loaded by image providersBea Lam2011-06-023-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add docs for 'source' and 'asynchronous' properties for AnimatedImage. Task-number: QTBUG-19504 Change-Id: Iec72dc7630308a94c37d00c6b008b5949c6fccd4 Reviewed-by: Martin Jones
* | | | | | | | | QDeclarative: fixed clean animation listsChristiaan Janssen2011-05-313-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9dd8b4fcd3f04193410710981a511b9f69e5dc19
* | | | | | | | | Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-305-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly since it's a good idea to prefix the plugin on Symbian, and at the same time it's now consistency called 'inspector' rather than 'observer'. Symbian .def files will need to be updated. Change-Id: I43071331c8002f8844efd14105d01c730d97e946 Reviewed-by: Kai Koehne
* | | | | | | | | QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-302-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne (reapplied commit 89d9b83aa26db4f528250c3fe4716b81955c6929 from qtcreator) Change-Id: I4cbfba2e854dd98a4e1012c71c40520f57fa9664
* | | | | | | | | QmlDebugger: parsing packets iteratively in the communication protocolChristiaan Janssen2011-05-301-38/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne (reapplied commit fea13a449c59690ae7b7f43aa64f50c0a290a2cf from qtcreator) Change-Id: I0c78188994029b2ac7daa3d59182566c5ec6c8b5
* | | | | | | | | ListView segmentation fault when setting highlight to nullMartin Jones2011-05-303-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting view highlight to null due to focus change caused a crash since graphicsview accessed the highlight item after it had been deleted. Remove highlight item from scene and deleteLater(), as is done for delegates. Change-Id: I5bfd59095aca90d3adca805bc4f61c92c192ee1b Task-number: QTBUG-19509 Reviewed-by: Bea Lam
* | | | | | | | | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-24324-5645/+5981
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-187-4/+49
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1625-50/+1618
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h
| | * | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-133-4/+36
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | QDeclarativeMouseArea: block context menu eventsCaio Marcelo de Oliveira Filho2011-05-132-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the MouseArea accepts the same button used to trigger a context menu event, it should not let the event to be delivered to item behind. This is important for items that do implement contextMenuEvent(), like QDeclarativeWebView. When there's a mouse area on top of this item and that accepts the right click (in Linux), the event was still being delivered and the WebView menu was incorrectly appearing. QtWebKit bug https://bugs.webkit.org/show_bug.cgi?id=56526 documents this problem. Change-Id: I386fac6c96f47b8616e2eeb7e5f97043ba418980 Merge-request: 1185 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| | | * | | | | | ListViews loses items if all visible items are removed.Martin Jones2011-05-131-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occurs when at end of list and all visible items are removed in multiple steps, without entering the event loop. We were not updating visibleIndex if there were no visible items when handling itemsRemoved(). Also avoid skipping items in refill if there are no valid visible items for reference. Change-Id: I2ff58fb191f6b053f33d5446220d597eb15b66d4 Task-number: QTBUG-19198 Reviewed-by: Bea Lam
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-065-0/+13
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainterpath.cpp src/gui/text/qfontengine_ft.cpp src/s60installs/eabi/QtGuiu.def
| | | * | | | | Views do not notify count changes properlyMartin Jones2011-05-053-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The views don't have a valid count until both a model and a delegate are provided. But, countChanged() is not called when a delegate is set after the model, so bindings to count were not evaluated. Also test that count is updated for insertion/removal Change-Id: Ic82039a624c02f0bdb2862ac7a6e215df75bb314 Task-number: QTBUG-19037 Reviewed-by: Bea Lam
| | | * | | | | Uninitialized memory is compared.Martin Jones2011-05-052-0/+4
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memory is allocated and used without first clearing it. At the least this annoys valgrind, but also has potential for real problems. Change-Id: Icf3fd39f44ee0481dd732510e7f8b3ad6cef477d Task-number: QTBUG-15187 Reviewed-by: Aaron Kennedy
| * | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-162-0/+33
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-05-122-0/+33
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | master-qml-staging
| * | | | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13324-5530/+5530
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-04-25 02:56:05 (GMT)