summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Set correct initial value for TextEdit and TextInput canPaste propertyYann Bodson2011-03-074-0/+78
| | | | | | Change-Id: Ied5b257305fa68db64fcf270ad2a42f691fbdca2 Task-number: QTBUG-17765 Reviewed-by: Martin Jones
* PinchArea example produced incorrect scaling.Martin Jones2011-03-071-2/+9
| | | | | | | | | The maths was dodgy - producing far greater scaling than that provided by PinchArea. Change-Id: I4a1ee1b0d65eed623ec9ee92c22c9740116430c5 Task-number: QTBUG-17828 Reviewed-by: Michael Brasser
* Fix TextInput auto test failure on mac.Andrew den Exter2011-03-041-0/+1
| | | | | | | | Disable auto scroll so the relative position of the text isn't changed when inserting text and changing the cursor position. Change-Id: I6a18e91e98014f1e94216bc85241ebb0d604dd84 Reviewed-by: Bea Lam
* Fix word selection locking on string boundaries.Andrew den Exter2011-03-042-12/+86
| | | | | | | | | | | | | QTextBoundaryFinder will return the position -1 if it reaches the end of a string without finding a boundary, reset the cursor and anchor to 0 or the string length as appropriate in those cases. Also allow selection to lock onto the string limits as if they were words. Change-Id: Ie9d233967c73eb6a61f19c76494f04bca18612f8 Task-number: QTBUG-17860 Reviewed-by: Martin Jones
* Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
| | | | | | | | inputContext() is only safe to call if there is a current contextWidget. Change-Id: I6cbccf5f5fbb2d8c9ca6acf5f7e02f680eb84483 Reviewed-by: Andrew den Exter
* QDeclarativePropertyMap::keys() cannot be called from qmlCharles Yin2011-03-033-8/+55
| | | | | | | | Not allow create dynamic properties which are same with existing method (method, signal, slot) names. Change-Id: I0ae64c8a6a89ef4f7614169088f7c005edad40b0 Task-number:QTBUG-17868 Reviewed-by:Martin Jones
* Compensate for horizontal scroll in TextInput micro focus.Andrew den Exter2011-03-032-1/+5
| | | | | | | | | Return the adjusted cursore rectangle rather than the one returned by QLineControl. Change-Id: I343ecdb47ef2ea59519c8d155bbb9917d9c8ce56 Task-number: QTBUG-17864 Reviewed-by: Martin Jones
* Position the TextInput cursor correctly after IM text is commited.Andrew den Exter2011-03-032-1/+19
| | | | | | | | | If text is removed before the cursor position decrement not increment the cursor by the by the difference. Change-Id: If9558c88157cc884652af7aaf9bd5fad0ea822d8 Task-number: QTBUG-17863 Reviewed-by: Martin Jones
* Make the TextInput cursorRectangle relative to the item.Andrew den Exter2011-03-022-3/+40
| | | | | | | | The rectangle returned was relative to the text and didn't adjust for horizontal scrolling. Change-Id: I09227d73bbd8b32d830744d5911d785246051c2f Reviewed-by: Martin Jones
* Don't assert if font engine creates new glyphsAaron Kennedy2011-03-023-5/+30
| | | | | Change-Id: Id18f58822f990788b511cbce02f8e4cf7d787c21 Task-number: QTBUG-14734
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-03-021-0/+9
|\
| * Add QML file for TextEdit positionAt test.Andrew den Exter2011-03-021-0/+9
| | | | | | | | Change-Id: I4632f77f87e8ced55a9959baaebd2b1624d0b568
* | Doc: remove experimental GestureArea from contents and add PinchAreaMartin Jones2011-03-023-2/+6
|/ | | | | Change-Id: I5eb6d2826f673c7067fde1447f25d3fc97b5aa5e Reviewed-by: Bea Lam
* Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-015-13/+115
| | | | | | | | | | Preedit text isn't visible outside the inner workings of the Text elements so any position returned that is greater than the current cursor position is invalid. Change-Id: I433fc635dcd6d087bde13fc47a1a92e4222a3b2c Task-number: QTBUG-17834 Reviewed-by: Martin Jones
* Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-016-8/+139
| | | | | | | | | | | Allows input handling to be disabled or changed while an input method is active. This might be used to allow mouse events through to the element or in conjunction with the cursor position to determine whether a click occurred on the preedit text. Change-Id: I35e148691920579c1d7c6f27b7e805d9551beadd Task-number: QTBUG-17835 Reviewed-by: Martin Jones
* Fix FolderListModel test - set folder to one containing files.Martin Jones2011-02-281-0/+3
| | | | | Change-Id: I95aabd35c3a33b603aa3b11130ddea5f5c101ce9 Task-number: QTBUG-17775
* Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-285-45/+108
| | | | | | | | | | | | | | | | | There are two related problems: - when dragging variable height content up beyond bounds items are destroyed, causing the maximum extent to change, which in turn causes skipping. This is fixed by storing the extents on press so that later changes do not affect drag behavior. - when variable height content is dragged beyond the bounds and and released, items are created as the view returns to bounds. This changes the extents, however the bound target was not updated. If the viewport height changes during fixup the bounds animation is now updated. Change-Id: Ib37ec9e51f8ceb71af1e2e58f25fd8da18dcd632 Task-number: QTBUG-17769 Reviewed-by: Michael Brasser
* FolderListModel emitted incorrect rowsRemoved range causing crash.Martin Jones2011-02-282-2/+31
| | | | | | | | | beginRemoveRows() takes the first and last index as parameters, but it was passing count rather than count-1 as the last index. Change-Id: I81a6fbf085acacf5f8c1ca847b0bdc826bcf405b Task-number: QTBUG-17775 Reviewed-by: Bea Lam
* fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-2812-52/+91
| | | | | | | | | Ensure attributes added in QtQuick 1.1 are marked with the '\since QtQuick 1.1' tag. Also add links to items listed in the QtQuick 1.1 section in whatsnew.qdoc. Task-number: QTBUG-17771 Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
* Fix test instability.Martin Jones2011-02-281-0/+2
| | | | | | | Allow the asynchronous view changes to complete before testing section positions. Change-Id: I09c7592205b6e3c55807ec1c5aa4b09f9cd8b92c
* Document BorderImage::asynchronousAlan Alpert2011-02-271-0/+14
| | | | | | It's been there forever, but someone forgot the documentation. Task-number: QTBUG-16612
* Ensure layout is updated when section property changes.Martin Jones2011-02-253-2/+28
| | | | | | | | | | | When the section property changed the sections were recalculated, but the items were not relayouted. Also avoid 'Unable to assign undefined value' warning by setting section item parent before component is completed. Change-Id: I7bd8eb369877a6faf72b32b80b45a68366c95772 Task-number: QTBUG-17759 Reviewed-by: Michael Brasser
* QDeclarativeDebug: Export needed symbols on SymbianKai Koehne2011-02-243-47/+47
| | | | | | | | | Allow applications to link against the QDeclarativeDebugService API. This is needed for on-device debugging of QML. (The removal of the symbols was a regression in 4.7.2). Task-number: QTBUG-17503 Reviewed-by: Tom Sutcliffe
* Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-243-3/+31
| | | | | | | | | Specifies whether positionAt should resolve to the nearest position between characters or the position of the nearest character. Change-Id: I9eb2db2f8dd2accb2d9844ff204fba0337e71876 Task-number: QTBUG-16070 Reviewed-by: Martin Jones
* Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
| | | | | Task-number: QTBUG-17472 Reviewed-by: Martin Jones
* Fix QPlainTextEdit corruption/crash with scrollingmae2011-02-231-1/+1
| | | | | | | | | | | | | There was an off-by-one error when QPlainTextEdit calculated the number of visible lines (not blocks) on the screne. When running into the error case, the number of visible lines was falsely 0 (not 1), which resulted in all softs of negative side effects as the scrollbar permitted the user to scroll behind the last paragraph. Task-number: QTBUG-17230 Reviewed-by: con
* DelayRemove of list delegate on section boundary duplicated sectionMartin Jones2011-02-233-8/+47
| | | | | | | | | | | | | | When removing a delegate with a removal animation that fell on a section boundary (i.e. owned the section header), the following item would also create a section header before the previous item was removed. Make updateSections() include the removed, but visible items in its update. Ensure updateSections() is called when the removed item is destroyed to ensure a new section header is created at that point. Change-Id: Ie831e3acf65b2989ebb030e2ab38cdbe179a9d45 Task-number: QTBUG-17606 Reviewed-by: Michael Brasser
* ListView and GridView indexAt should use qreal coordinates.Martin Jones2011-02-234-6/+6
| | | | | | Change-Id: Ibe6969b5c3209062213c6582eaf4c285bcb793de Task-number: QTBUG-17594 Reviewed-by: Bea Lam
* Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-22390-17250/+13086
|\ | | | | | | | | Conflicts: tools/qml/qml.pri
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-211-133/+138
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add selected P1 tasks to changes file.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jason McDonald2011-02-211-0/+1
| | |\
| | * | Add selected P1 tasks to changes file.Jason McDonald2011-02-211-133/+138
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-215-6/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for QMAKE_CLEAN in symbian-sbsv2 Only add NetworkServices capability automatically if no caps are set.
| | * | | Added support for QMAKE_CLEAN in symbian-sbsv2Miikka Heikkinen2011-02-213-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files specified in QMAKE_CLEAN variable will now be properly cleaned in symbian-sbsv2 builds. Task-number: QTBUG-17004 Reviewed-by: Janne Koskinen
| | * | | Only add NetworkServices capability automatically if no caps are set.Miikka Heikkinen2011-02-212-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows overriding the NetworkServices capability for the applications that do not need the capability even though they link network, webkit, or declarative. It is also more intuitive as there are no magic additions to user defined capabilities. Task-number: QTBUG-17540 Reviewed-by: Janne Koskinen
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-211-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Wheel delta is always zero in QEventTransition's event
| | * | | Wheel delta is always zero in QEventTransition's eventDean Dettman2011-02-211-0/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | When a QGraphicsSceneWheelEvent was cloned, the original event's delta property was not copied. Task-number: QTBUG-17536 Reviewed-by: Kent Hansen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-2024-129/+351
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Autotest: make at least one update before checking if more are needed Fix warning about id maybe used when uninitialised Doc: setSslConfiguration also sets the CA certificates Autotest: check that the type received is the expected one Attempt to fix symbian 3.1 and 3.2 compile break. Prevents crashing when ICO file has bad color table value directfb: fix crash in client/server mode of qws Make Qt/DirectFB less verbose about failing to load pixmaps. Autotest: don't use the deprecated signal from QDBusConnectionInterface Autotest: be nicer to the subprocess and SIGTERM it Fix warnings in QtDeclarative Autotest: avoid memory leaks if test fails QtDBus: Make sure we can receive unknown types QtDBus meta object: keep methods, signals and props with unknown types Autotest: add a new test for parsing an introspection with unknown types Make the QtDBus parser not complain about unknown things fix-layer-getsurface-result-check-for-screen-size-determination Bump QtWebKit version to 2.0.2 SSL: fix memory leak when loading certificates on Mac OS X Add a mutex to protect the access to the QSet. ...
| | * | Autotest: make at least one update before checking if more are neededThiago Macieira2011-02-201-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | The timer gets started only by making updates. If you try to check if an update is needed without making the first update, the timer won't be started and the function will return false.
| | * | Fix warning about id maybe used when uninitialisedThiago Macieira2011-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | The code would indicate it's never used uninitialised, but gcc doesn't know it.
| | * | Doc: setSslConfiguration also sets the CA certificatesThiago Macieira2011-02-201-2/+3
| | | |
| | * | Autotest: check that the type received is the expected oneThiago Macieira2011-02-201-8/+43
| | | | | | | | | | | | | | | | Task-number: QTBUG-17476
| | * | Attempt to fix symbian 3.1 and 3.2 compile break.Jason McDonald2011-02-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e46c44f9538dbe5b44ce61d3a42403cfa471ae8b restructured qml.pri. In the original version the else part at the bottom of the file was processed for Symbian 3.1 and 3.2, but the commit stopped that from happening. This commit makes the minimal change to make the statements in the else part apply to 3.1 and 3.2 again. Really the file should be restructured to have separate logic for setting each vairable, but I'll leave that task for the developers. Reviewed-by: Eckhart Koppen
| | * | Prevents crashing when ICO file has bad color table valueMauri Vehniäinen2011-02-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When color table value is read from ICO header memory allocation is made based on this value. This case is relevant only when reading 8bit images. Therefore values over 256 will abort reading the image. Task-number: QT-4535 Merge-request: 1090 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | directfb: fix crash in client/server mode of qwsDenis Oliver Kropp2011-02-172-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The server was crashing due to client pointer being sent as "sibling". Instead surface flags are sent and sibling code is removed. Also the window ID is transfered and used on receiver side to get a local handle to the window. Click to focus window works, but it is not raised. Merge-request: 989 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
| | * | Make Qt/DirectFB less verbose about failing to load pixmaps.Anders Bakken2011-02-171-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt/DirectFB is way too verbose about not being able to use DirectFB for loading images. A lot of times DirectFB doesn't have support for e.g. pngs or gifs and currently one gets a message for every failed pixmap load, even if they will succeed when falling back to Qt. Merge-request: 2552 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
| | * | Autotest: don't use the deprecated signal from QDBusConnectionInterfaceThiago Macieira2011-02-171-39/+17
| | | |
| | * | Autotest: be nicer to the subprocess and SIGTERM itThiago Macieira2011-02-171-1/+2
| | | |
| | * | Fix warnings in QtDeclarativeThiago Macieira2011-02-173-3/+3
| | | |
| | * | Autotest: avoid memory leaks if test failsThiago Macieira2011-02-171-24/+41
| | | |
generated by cgit v0.12 at 2025-09-05 09:55:32 (GMT)