aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktextedit
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'stable' into devSergio Ahumada2013-08-052-32/+53
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557
| | * Fix tst_qquicktexteditRafael Roquetto2013-08-022-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use showNormal() instead of show() to keep expected window sizes on fullscreen platforms. - Use consistent point size for hAlignVisual - Do not query for QQmlComponent::Loading on remoteCursorDelegate: when a new connection is established to the test http server, it will setup a single shot QTimer with a 500ms timeout that will trigger the reply to be sent back, making the call to sendDelayedItem() obsolete and reduntant. Also, it means that in some platforms, data will arrive back to the component before the check for QQmlComponent::Loading is executed, causing the test to fail since at this point the status will already be QQmlComponent::Ready instead. Change-Id: I6508c28fa55a1aa2ae5861922701a8c322342380 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Stabilize text tests that grab windows.Friedemann Kleint2013-07-252-23/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add window flags to make sure window stays on top to tst_qquicktext::hAlignImplicitWidth() and tst_qquicktextedit::hAlignVisual(). Add diagnostic output. Determine the section size by checking the font size. Add more characters to line 2 to make it more discriminative. Task-number: QTBUG-32540 Change-Id: I19a74a775bf2663027ec211784870fd9f6547b48 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into ↵Simon Hausmann2013-07-261-1/+1
|\| | | | | | | | | | | | | | | | | merge Change-Id: I5824a3eb624b325de10acfd5109c4c1bdabcf780
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-231-1/+1
| |\| | | | | | | | | | Change-Id: I2279f181b1c30e81651f8907447ec5c826e11475
| | * Replace qt.nokia.com by www.qt-project.org in tests.Friedemann Kleint2013-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: If318cf9bbcaa36e6e60d693dd0cb9a58768af47b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into ↵Simon Hausmann2013-06-242-7/+172
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wip/v4 Conflicts: src/imports/qtquick2/plugins.qmltypes src/qml/debugger/qv8debugservice.cpp src/qml/qml/qml.pri src/qml/qml/qqmlcompiler.cpp src/qml/qml/qqmlcomponent.cpp src/qml/qml/qqmlcontext.cpp src/qml/qml/qqmldata_p.h src/qml/qml/qqmlengine_p.h src/qml/qml/qqmljavascriptexpression.cpp src/qml/qml/qqmlxmlhttprequest.cpp src/qml/qml/v4/qv4bindings.cpp src/qml/qml/v4/qv4irbuilder.cpp src/qml/qml/v4/qv4jsonobject_p.h src/qml/qml/v8/qqmlbuiltinfunctions.cpp src/qml/qml/v8/qv8bindings.cpp src/qml/qml/v8/qv8contextwrapper.cpp src/qml/qml/v8/qv8listwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper_p.h src/qml/qml/v8/qv8sequencewrapper_p_p.h src/qml/qml/v8/qv8typewrapper.cpp src/qml/qml/v8/qv8valuetypewrapper.cpp src/qml/types/qqmldelegatemodel.cpp src/quick/items/context2d/qquickcanvasitem.cpp src/quick/items/context2d/qquickcontext2d.cpp sync.profile tests/auto/qml/qjsengine/tst_qjsengine.cpp tests/benchmarks/qml/animation/animation.pro tools/qmlprofiler/qmlprofiler.pro Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
| * | Add QQuickTextEdit::append()J-P Nurmi2013-06-121-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to append text more efficiently than appending to the text -property, and also avoids weird rich text formatting issues with the latter approach. Task-number: QTBUG-31575 Change-Id: Id621773588b94e36f8f0b9eb6b22590e9db62811 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * | Add QQuickTextEdit::hoveredLinkJ-P Nurmi2013-06-072-7/+18
| |/ | | | | | | | | | | Change-Id: I9d75a97c86e047742514f942cdb91c70f1d7a9a2 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | More steps towards eliminating the v8 layerSimon Hausmann2013-05-071-0/+1
| | | | | | | | | | | | | | | | * Changed the return type of the InvocationCallback from a v8 handle to a QV4::Value * Removed v4 auto tests and fixed build of other tests Change-Id: Ic927b925923ca8785170689a5c260969fd1cb794 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix compilation with built-in v4vm JS engineSimon Hausmann2013-04-151-1/+1
|/ | | | | Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make sure that TextInteractionFlags get set.Frederik Gladhorn2013-03-191-1/+1
| | | | | | | | | | | | | | The first time the function is called, it could fail to set the flags. Calling setSelectByKeyboard(true) would not actually set the text interaction flags (was == on). The test didn't detect it because it called setReadOnly before setSelectByKeyboard. Change-Id: Ia54cc782b6ad5a74f1d7029c92fa230116d034b0 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Add TextEdit::selectByKeyboardJ-P Nurmi2013-03-151-0/+124
| | | | | | | | | The main use case is for enabling text selection by keyboard for read-only editors. Change-Id: Ieaa9af366fd0eaf863a104a2fdf33c9ddad38b10 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-0/+1
|\ | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
| * Improve timer dependent tests.Frederik Gladhorn2013-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QQuickLoader::loadedSignal depended on sharing the engine with simultaneousSyncAsync and that function being run before it. After each test run call clearComponentCache() as that is important for caching of the network tests. The test server would send the item after 500ms. Sometimes the CI would be faster or slower. Instead of relying on timing, simply call a function when the reply should be sent. Change-Id: Ifb0447041197e1cba103570597a62a2510d31aab Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Tests: add autotests for TextEdit and TextInputCaroline Chao2013-03-072-0/+78
| | | | | | | | | | | | | | | | | | | | Check the selection is not cleared when the control receives a focus out event with one of the following reason: - Qt::ActiveWindowFocusReason - Qt::PopupFocusReason Change-Id: I38f4a4cba5e769f19de4e327d03be57a8d1d36a7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-251-0/+2
|\| | | | | | | Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
| * Stabilize clicking in QQuickTextEdit testFrederik Gladhorn2013-02-211-0/+2
| | | | | | | | | | | | | | | | | | This test would try to emulate mouse clicks and not wait inbetween. That can lead to clicks spilling over to the next mouse event. Change-Id: I320f86453215190a1c694ba49c0fc3831dcb60b9 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-231-1/+1
|\| | | | | | | Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
| * Stabilize QQuickTextEdit testFrederik Gladhorn2013-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | tst_qquicktextedit::remoteCursorDelegate was failing because the test server served the the remote file too fast. It seems like the test relied on a slow machine to run it. Instead pass the Delay option to make the server serve the file delayed. Change-Id: Id99feea07f2da3b2ea0aa6c07e9b548e8f81f18b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge branch 'stable' into devGunnar Sletta2013-01-171-1/+1
|\| | | | | | | | | | | | | | | Conflicts: src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | | | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Do not force focus for non-focused windows.Gunnar Sletta2013-01-171-0/+2
|/ | | | | | | | | | If a QQuickWindow comes to screen but is not the focus window, such as if it is a child window of another window, it should not have focus by default. Change-Id: If9015bbc179bb101178b3bc8de176a1c71c46023 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix compiler warnings in declarative tests.Friedemann Kleint2012-12-201-0/+2
| | | | | | | | | | | | - Unused variables - Missing enumeration values in switch - truncation from double to float - truncation from size_t to int - Missing initializers - Mix of operator & and bool | Change-Id: Ib212aeea41befef193f12300a1d9814a60f183af Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Renamed QQuickItem::pos property to positionShawn Rutledge2012-11-291-4/+4
| | | | | | | | | Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-081-30/+30
| | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* test: Mark `tst_qquicklistview', `tst_qquicktext', and `tst_qquicktextedit' ↵Sergio Ahumada2012-10-291-0/+2
| | | | | | | | as insignificant Task-number: QTBUG-27740 Change-Id: I20b15ae35f736f1c43a85e9a37ec3fda19896b07 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix QQuickTextInput::moveCursorSelection()Konstantin Ritt2012-10-191-2/+0
| | | | | | | | | | | by using fixed QTextBoundaryFinder behavior. Update QQuickTextInput autotests. Task-number: QTBUG-11365 Change-Id: I81761c019e2fe80c9795fe54a2a990bfc5d4b709 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove interim compatibility measuresAlan Alpert2012-10-161-6/+6
| | | | | | | | Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Mark some tests as insignificant to let change#35527 be integratedKonstantin Ritt2012-09-261-0/+3
| | | | | Change-Id: Ic4f7200e04d1decf3eb1be551606a73eeb90c5e5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Auto tests: PlatformQuirks::isClipboardAvailable()J-P Nurmi2012-09-171-51/+23
| | | | | Change-Id: I24c4417b7475ab07a47fbf5bf23d859e38b5c9ae Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Remove tst_qquicktextedit::alignments()J-P Nurmi2012-09-1311-91/+0
| | | | | | | | | | | These tests are not valid. Will be covered by Lancelot-based scenegraph rendering tests: https://codereview.qt-project.org/#change,34437 Change-Id: I5f32d09f95bab1b153c821b101599ee7d52e1867 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Caroline Chao <caroline.chao@nokia.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* doc: fix some typos in .cpp filesSergio Ahumada2012-09-071-1/+1
| | | | | Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fix pasting with the middle button in TextInput and TextEdit.Andrew den Exter2012-08-061-0/+53
| | | | | | | | Neither item accepted the middle button which prevented the mouse events ever reaching them. Change-Id: Ia8f693099df4d6c248976453d554fef96d1d3b33 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add tests for copy and paste using keyboard shortcuts.Andrew den Exter2012-08-061-0/+70
| | | | | | | Fixes TextInput.cut() removing text while read only. Change-Id: I03cd44d381be9d53f71ba168b8be7971ab0bbad7 Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-011-0/+1
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I6988c2360e9d88916311374a0c910bfc5b607439 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add tests for Text(*) default property values and notifiers.Andrew den Exter2012-07-301-5/+162
| | | | | Change-Id: I64bfe285ab4ddad53a4d323ca93b15ea0426ed51 Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* QtQuick: Remove usages of qWaitForWindowShown(QWindow *).Friedemann Kleint2012-07-241-2/+2
| | | | | Change-Id: I722e20b2fb8d8c6c19c6f3f2cb16910d7433e9a4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QQuickCanvas renamesAlan Alpert2012-07-171-188/+188
| | | | | | | | | | | | | | | | QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix horizontal alignment of unwrapped text in TextEdit.Andrew den Exter2012-07-165-5/+105
| | | | | | | | | | When the actual width of the text in a QTextDocument exceeds the specificed textWidth it is aligned left irregardless of the text alignment. Compensate by doing our own alignment of the laid out document. Change-Id: I7df900316ffb3ecdf01ddb053480a60a8258182d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix TextEdit and TextInput test failures.Andrew den Exter2012-07-131-59/+47
| | | | | | | | | | | | | Use qWaitForWindowActive and instead of qWaitForWindowShown where focus is required. Also send events directly to the tested item, instead of getting a pointer to the same object from QGuiApplication::focusObject() which can return null and crash the test if focus is stolen. Change-Id: I6b8956a3afc8ffa58394a957a35b64b1c0924596 Reviewed-by: Damian Jansen <damian.jansen@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add tests for instantiating cursor delegates in the Loading state.Andrew den Exter2012-07-113-3/+56
| | | | | | | | | Components created by QML are usually (always?) ready when assigned to n property, but it possible for an externally supplied component to still be loading, as in the test and the code handles it. Change-Id: I2058e3479e2e711b52af2a0128e6e4c4c3ff7504 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use qWaitForWindowActive() where it is required.Friedemann Kleint2012-07-091-5/+4
| | | | | | | | | | | Prepare a change in qtbase in which the implementation of qWaitForWindowShown() will be changed to qWaitForWindowExposed() instead of qWaitForWindowActive(). Try to stabilize further tests by introduing wait functions instead of calls to qApp->processEvents(). Change-Id: I9825885430d78be1610a3fe20023fad24aaacba9 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Speed up TextEdit construction time.Andrew den Exter2012-07-091-3/+5
| | | | | | | | | | | | Defer setting content on the QTextDocument until componentComplete() to avoid unnecessary layouts and move one time setup for the text document from setContent to the constructor. Reduces the construction time of a TextEdit with RichText textFormat by about a third. Change-Id: Idde0772063bf769cde984efddd68589c55a7431a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add tests for triple click text selection in TextEdit.Andrew den Exter2012-07-042-46/+114
| | | | | | | | | | | Includes a minor behavioural fix for selectedText and getText so that they return plain text strings for plain text content rather than the raw text from QTextDocument which substitutes line break characters with unicode line or paragraph separator character. Rich text documents still return the unicode characters. Change-Id: I19a3a5bba2e4ebb0e6607e19c915a588a9a6c7db Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use the convential form for the selectedText notify signal name.Andrew den Exter2012-07-021-7/+7
| | | | | | | | | Rename selectionChanged to selectedTextChanged to address an apparent difference to API between TextInput and TextEdit. Task-number: QTBUG-19732 Change-Id: Ibc589c8b43567cb8d2f8c13f7366e2859c7f09d7 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* activeWindow is deprecated, use focusWindow.Thiago Macieira2012-06-271-5/+5
| | | | | | | | | This complements commit 2753e9a795537df10c5a3b64ec9f6d8d81381837, which had begun fixing this issue, but not completed the entire module. Change-Id: I2d167e467c5553cfa49e04410aec9a7d98c7fc6e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove the open and closeSofwareInputPanel functions.Andrew den Exter2012-06-221-8/+0
| | | | | | | | | Functionality is provided by the global Qt.application.inputMethod object. Task-number: QTBUG-21449 Change-Id: I75c082bcbe44c8834ccaf966a3f9a09ab91ec290 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Ensure the cursor delegate position is updated on text changes.Andrew den Exter2012-06-054-1/+21
| | | | | Change-Id: I7518aa5969ea45538feccb87f4c296db6b7d6944 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>