aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtquick1/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Add accessibility to qmlFrederik Gladhorn2012-01-027-0/+266
| | | | | | | | | | | | | | | This consists of two parts: An attached property for QML items and a plugin for the accessibility framework. The attached property simply takes care of some properties (name, role) that are needed in order to expose semantics of the application to assistive tools. The plugin exposes the hierarchy of QML items to the accessibility framework. Change-Id: I32f5603d0d9549b01b3645b205b710b9801762f7 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Make editors commit preedit themselves on losing focusPekka Vuorela2011-12-201-1/+3
| | | | | Change-Id: I1d42a8804068718c7347b4f652289f9724c25a3c Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* TextEdits to include tentative commit in text propertyPekka Vuorela2011-12-141-2/+2
| | | | | | | | | | Similar to what qtbase 1dbfbf4c66187e7522888c19d78024cfceaea570 did for QTextEdit. Now available only in plain text, html support pending. Change-Id: I0b23a45fc484512d3354f66e1a6134e2d70eb8b5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove dead private method from TextEdit implementationsPekka Vuorela2011-12-092-18/+0
| | | | | Change-Id: I6c9a7c71607167b326dc45a35d97bcaf25a9d1b9 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Introduce more generic fast property handlingAaron Kennedy2011-12-052-13/+0
| | | | | | | Also reduce the number of direct calls to qt_metacall(). Change-Id: I04cd6e516a3e61058548309a19fe0b830f15c93f Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Use QWidgetTextControl in the QtQuick1 TextEdit.Andrew den Exter2011-12-022-6/+9
| | | | | | | | | | | QDeclarative1TextEdit and QTextEdit have the same compatbility requirements so it makes sense they continue sharing the same line control implementation. This allows the QtQuick 2 TextInput to diverge without creating a third variation of QTextControl, Task-number: QTBUG-22627 Change-Id: Id4a8f6a17aeb756c3385cf8fca3de61b8c4be757 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use QWidgetLineControl in the QtQuick1 TextInput.Andrew den Exter2011-12-022-29/+29
| | | | | | | | | | | QDeclarative1TextInput and QLineEdit have the same compatbility requirements so it makes sense they continue sharing the same line control implementation. This allows the QtQuick 2 TextInput to diverge without creating a third variation of QLineControl. Task-number: QTBUG-22627 Change-Id: Ic06f66f1cb55e78f7129889a4877c3aba5ba72f6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix uninitialized member variable in QDeclarativeTextEditPekka Vuorela2011-12-011-1/+1
| | | | | | Change-Id: I7ef3902488bb4ba1129933e3a4015e266be8b821 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Made TextInput mouse events commit preeditPekka Vuorela2011-12-011-30/+25
| | | | | | | | | Similar to what was earlier done on QWidgets editors. Additionally updated tests to check QInputPanel::invokeAction instead of the obsolete QInputContext mouse handler. Change-Id: Ia2bd22eebdeed79cff7a4925129b28dd1500b1ad Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* TextInput elements not to have tentative commit in inputMethodQueryPekka Vuorela2011-11-241-1/+1
| | | | | | | | Tentative commit should not be part of surrounding text, it's already a property of the input method. Change-Id: I64aec9763fb20770b6729f7f59dcbe23cf5a6718 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Silence compiler warnings about unused variables (MSVC)Kai Koehne2011-11-211-3/+4
| | | | | | | Fixes most 'C4189: local variable is initialized but not referenced' warnings Change-Id: I8c5a1ba0a50dd3fcb22294e564425846362ee911 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename QDeclarativePropertyCache::Data to QDeclarativePropertyDataAaron Kennedy2011-10-261-1/+1
| | | | | | | This class is now too large to be nicely nested. Change-Id: I32cfa5caa524b8bf447d1f8c53ef2763f60bdac1 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Declarative: Fix MSVC and g++ warningsFriedemann Kleint2011-10-191-1/+2
| | | | | | | | | | | | | | | | | Potentially severe: - Fix int/bool mismatches - Use of uninitialized variable - Do connectionMask shift operations in 64bit - Enum type mismatch for QLineControl::EchoMode Various: - class/struct mismatches - UnhandledEnumeration values - Unused variables - Constructor initialization order Change-Id: Ieb52f8990445fe95f94070175a0f9beb66863240 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Cannot flick to the end of a horizontal ListView with LayoutMirroringMartin Jones2011-10-172-15/+10
| | | | | | | | | | | | | | | Forward port of fix for QTBUG-21756. minXExtent calculated the offset due to highlight range incorrectly (reversed) when mirroring enabled. Also us same algorithm for fixup() in GridView and ListView uses. For QtQuick 2, this change also reverses the beginning and end highlight range, as it should be, i.e. the preferredHighlightBegin is from the right side in RightToLeft mode. Also added snapping tests. Task-number: QTBUG-21756 Change-Id: Ica0ba4ab5db0ce9c77f2da75e9f8293550bd37d1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove QMetaObjectBuilder from declarative.Friedemann Kleint2011-10-141-1/+1
| | | | | | | | Link on Windows. Change-Id: Idca11c1a21ad5aebf79d6487692d912b4dea249f Reviewed-on: http://codereview.qt-project.org/6553 Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* Manually apply SnapOneItem/Row changes from Qt 4.7Martin Jones2011-09-284-156/+223
| | | | | | | | | | | | Apply following changes to Qt 5 for both QtQuick1 and QtQuick2 items: cf23188de237009136fa1480ab8fd9e3ca364769 f85819fe083ae7c6804c884de68e906d153a6d11 09cd2f818208a83489fae034b80e6497b7cc83af Task-number: QTBUG-20683 Change-Id: I974764e57e3004514bb4c9f46c5152ad07c136a7 Reviewed-on: http://codereview.qt-project.org/5484 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-09-161-9/+21
| | | | | | | | | | | | | | | Change 55cfbdb7c64068ae68f7baaceb8acfb96cb0c07e manually applied from Qt 4.7 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: Ia77249be9980aba268a1bfa0ea3f69c49fa09e5e Reviewed-by: Bea Lam Reviewed-on: http://codereview.qt-project.org/4712 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-122-3/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * Fix left alignment of native RTL pre-edit text.Andrew den Exter2011-09-072-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | If there is no committed text in a TextInput or TextEdit determine if the pre-edit text is right to left before falling back to the global keyboard settings. Change-Id: I7e5568e936341602b8faf7be120f9a770c115f48 Task-number: QMLNG-72 Reviewed-by: Michael Brasser Reviewed-on: http://codereview.qt.nokia.com/4176 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Delay masking the last character in Password echo mode.Andrew den Exter2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an integer value in milliseconds, QLineEdit and TextInput will display the last character entered unmasked for that delay period and then mask the character as normal. If QT_GUI_PASSWORD_ECHO_DELAY is not defined then the behaviour is unchanged. Task-number: QTBUG-17003 Reviewed-by: Martin Jones (cherry picked from commit f9e7aee2019d321edd655bfde7de43f20a106971) Change-Id: Iddfa0daa1b39f0589cab27e5003fdd86ad81ff89 Reviewed-on: http://codereview.qt.nokia.com/4170 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* | Fix TextInput and TextEdit software input panel on qtquick1Pekka Vuorela2011-09-082-10/+6
| | | | | | | | | | | | | | Change-Id: I39da7a877cef546da69bccfcf7ee1ae2ba92b208 Reviewed-on: http://codereview.qt-project.org/4455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-317-10/+10
| | | | | | | | | | | | | | | | | | | | | | Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-312-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
| * QDeclarative::hasActiveFocus should return false for hidden itemsAlan Alpert2011-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | Forward-port of a1b2be3c8a64aee832c648c6dcdff003f22318a3 from 4.8 Task-number: QTBUG-21045 Change-Id: I055e4dd18e43ccce92d0cae96b10809adb4dcc3a Reviewed-on: http://codereview.qt.nokia.com/3857 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Fix conversion of QAbstractItemModel::rowsMoved() parametersBea Lam2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | VisualDataModel was emitting itemsMoved() signal with incorrect "to" value when multiple items were moved forwards. (change cherry picked from b64817858484db6e7c280d41ed81d4c87dff2275) Change-Id: I684eb1716d2ad6e0f702e95d9c0cd5c6fe2c9cbb Reviewed-on: http://codereview.qt.nokia.com/3694 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-2519-77/+99
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
| * Allow borderimage .sci source to be a quoted filenameChris Adams2011-08-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, attempting to set the source property of a border image via a .sci file to a quoted filename would fail. This commit adds support for quoted source filenames. Task-number: QTBUG-20709 Change-Id: Ida54ef42bc07081457fd945bb279f3cc82c26e10 Reviewed-on: http://codereview.qt.nokia.com/2724 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Damian Jansen <damian.jansen@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Copy the docs for QtQuick 1Alan Alpert2011-08-0917-69/+69
| | | | | | | | | | | | Change-Id: Iaaaaaaa13726fa471f94fc7f809911164df24544 Reviewed-on: http://codereview.qt.nokia.com/2755 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * ListView with StrictlyEnforceRange skips over itemsMartin Jones2011-08-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When list item size varies smaller items next to larger items may not be able to become the current item. Ensure the snap item is found using the correct range, i.e. half of previous item above snap pos and half of next item below. Change-Id: I52ae235e6b801bda48fcb636bb4150ab643715e8 Fixes: QTBUG-20745 Reviewed-on: http://codereview.qt.nokia.com/2650 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Fix content position for key navigation with StrictlyEnforceRangeBea Lam2011-08-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a ListView had highlight ranges and StrictlyEnforceRange, but no highlight item, the content would not move to the correct position when incrementCurrentIndex() and decrementCurrentIndex() were invoked. trackedPositionChanged() shouldn't take the current section pos into account because this is already calculated by FxListItemSG::position() (this wasn't the case when the code in trackedPositionChanged() was originally written). Task-number: QTBUG-20287 Change-Id: I1624b5afd1efbe27630349143b7af2b486cfa260 Reviewed-on: http://codereview.qt.nokia.com/2429 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Views with no delegate crash when items are inserted.Martin Jones2011-08-022-6/+6
| | | | | | | | | | | | | | | | | | | | | | Check that we have a valid VisualModel before reacting to model changes. Change-Id: I6107e8fb8942a3625e501ab549a337f1affd4fbd Fixes: QTBUG-20640 Reviewed-on: http://codereview.qt.nokia.com/2481 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Nesting PathView and Flickable causes PathView to stop at wrong offsetMartin Jones2011-08-023-0/+19
| | | | | | | | | | | | | | | | | | | | | | Don't stop current animation until a drag is actually initiated. Also ensure we handle a stolen grab sensibly. Change-Id: I0ad493595fb85e1c9bace2d805184f911341fce2 Fixes: QTBUG-19439 Reviewed-on: http://codereview.qt.nokia.com/2420 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-111-2/+2
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/declarative.pro src/imports/gestures/gestures.pro src/imports/inputcontext/inputcontext.pro src/qtquick1/graphicsitems/qdeclarativeitem.cpp src/qtquick1/qtquick1.pro Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
| * Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Build against refactor.Samuel Rødal2011-07-299-11/+15
|/ | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Document how to have two MouseAreas simultaneously hovered.Michael Brasser2011-07-291-1/+27
| | | | | | | | Task-number: QTBUG-17228 Change-Id: Icfb3774429f0f19084f126a0b87699f1d03220f6 Reviewed-on: http://codereview.qt.nokia.com/2369 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Clicking on a disabled ListView's delegate breaks mouse interactionMartin Jones2011-07-291-1/+1
| | | | | | | | | | A disabled Flickable should not filter children. Change-Id: I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0 Fixes: QTBUG-20584 Reviewed-on: http://codereview.qt.nokia.com/2354 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Document stops as default property of GradientAlan Alpert2011-07-291-0/+2
| | | | | | | | | | | This will hopefully be copied to the QtQuick2 item when we write docs for them. Task-number: QTBUG-16045 Change-Id: I427b468630b59bd4bd6eca907ab12a66ee219d29 Reviewed-on: http://codereview.qt.nokia.com/2320 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* ListView doesn't show new 1st item currentItem is removed.Martin Jones2011-07-282-19/+19
| | | | | | | | | | | | | If the new 1st item becomes the currentItem after removal it was positioned incorrectly because the currentItem is positioned based on visibleIndex, which was updated after the currentItem was updated. Move visibleIndex update before currentItem update. Change-Id: Iaf92a41eefe7bce093e3000d17f5496dba144bcd Fixes: QTBUG-20575 Reviewed-on: http://codereview.qt.nokia.com/2316 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* A change in ListView's header height can cause it to overlap the itemsMartin Jones2011-07-281-2/+1
| | | | | | | | | | | If there are no visibleItems the header has no choice but to set visiblePos to a value after itself. Change-Id: I7748db46272989e421eeca88577b6fcf79814b5b Fixes: QTBUG-19844 Reviewed-on: http://codereview.qt.nokia.com/2254 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix insertion of one item in ListView.Martin Jones2011-07-281-1/+1
| | | | | | | | | | Off-by-one meant that the item was not created by the ListView. Change-Id: If9658487a615e189c21c419e4d29e7e709e05cef Fixes: QTBUG-19675 Reviewed-on: http://codereview.qt.nokia.com/2251 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* View highlight flickers with highlightRangeMode: ApplyRangeMartin Jones2011-07-282-8/+6
| | | | | | | | | | | | The view position was alternating between the start and end of the highlight range if the range < delegate size. Now favor the range start in this case, as per StrictlyEnforceRange. Change-Id: Icb895f972ccb9598ecf7238259093584c43ae291 Fixes: QTBUG-18067 Reviewed-on: http://codereview.qt.nokia.com/2226 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Bounding rectangle for image is wrong for PreserveAspectCropYann Bodson2011-07-261-1/+16
| | | | | | | | Task-number: QTBUG-20300 Change-Id: I8aa84ec64f7be536e56cdc1c04a6c2f204e06c26 Reviewed-on: http://codereview.qt.nokia.com/1859 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fixes AnimatedImage documentationYann Bodson2011-07-261-9/+2
| | | | | | | | | | Animated images are not cached or shared internally. Task-number: QTBUG-14847 Change-Id: I0b9362a4ff9299b4c18057fb6f005925386f48d1 Reviewed-on: http://codereview.qt.nokia.com/2143 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Correct TextInput.PasswordEchoOnEdit documentation.Andrew den Exter2011-07-251-1/+2
| | | | | | | | | | | | | The documentation incorrectly stated that this mode masked all but the last character, the actual behavior is as described in the QLineEdit documentation. Task-number: QTBUG-20003 Change-Id: I8a89a6818c930125821435bc04121340968dfbb2 Reviewed-on: http://codereview.qt.nokia.com/2067 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Scroll correctly when cursorPosition is changed within onTextChanged.Andrew den Exter2011-07-251-2/+2
| | | | | | | | | | | | | | | | | | | | | Emit textChanged() before adjusting size and scroll positions otherwise the calculations will be based on the cursor position before it's moved in handler and because the cursor position won't ultimately have changed there won't be a follow up cursorPositionChanged() signal to trigger a second set of calculation. Task-number: QTBUG-19912 Reviewed-by: Martin Jones (cherry picked from commit bb11b53bedb8e239b9439b4a3fc3320e35c2de57) Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp Change-Id: I579bc3fe6c80766dfadfbc9dbd46144607bf7b03 Reviewed-on: http://codereview.qt.nokia.com/2058 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Documentation fix.Casper van Donderen2011-07-221-10/+6
| | | | | | | | | Fixes: QTBUG-20390 Change-Id: I30a4b4d1618f80c9a1246955a9b1d6c9f8fbfd57 Reviewed-on: http://codereview.qt.nokia.com/1655 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Bulk update of QtQuick 1 docs to \qmlmodule syntaxAlan Alpert2011-07-2125-604/+652
| | | | | | | | Change-Id: I7ed2b54ef5a706dcaf7e19d221a6dda7b2620e8c Reviewed-on: http://codereview.qt.nokia.com/1681 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove traces of webkitAlan Alpert2011-07-201-4/+0
| | | | | | | | | | | Removes the entire wince section for qmlviewer.pro, as wince is not yet supported for qt5 and its unclear what damage removing the webkit part would have done to it. Change-Id: Ib0c721856bb7a28c3238e85c8cc93b43e6e63368 Reviewed-on: http://codereview.qt.nokia.com/1267 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-1288-0/+41140
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 23:42:06 +0000