aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktextinput
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Prospective fix for flakey "network" related QML testsv5.4.2Simon Hausmann2015-04-251-5/+2
| | | | | | | | | | | | | | | | | | | | | Replace hard-coded server ports with dynamically allocated ports. Change-Id: Iab8f9a88343a9f2c49af3cd700c954c13c3bf121 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Move QtQuick validators out of qquicktextinput_p.hJ-P Nurmi2015-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | TextField (v2) inherits QQuickTextInput, and therefore has to include qquicktextinput_p.h. Move the internal Q_AUTOTEST_EXPORT'd classes out of the header to avoid build problems on Windows due to missing symbols Change-Id: I6f37cf4e112425ff6c4c0a4ccc5e584f26599d8a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | TextInput: add support for paddingJ-P Nurmi2015-03-052-5/+132
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible for TextField to inherit TextInput, reserve space for the decoration, and set the desired property defaults without having to create dozens of property aliases. [ChangeLog][QtQuick][TextInput] Added padding, leftPadding, topPadding, rightPadding and bottomPadding properties. Task-number: QTBUG-41559 Change-Id: Iaa7697a10a6f66685c7cae454edf4c1984d411bc Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* / Update copyright headersJani Heikkinen2015-02-121-7/+7
|/ | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* autotests: fix build on iOSRichard Moe Gustavsen2014-09-111-1/+1
| | | | | Change-Id: Idf854ad4f868e873582731dfa6b0253ac5b17c5c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* TextInput::displayText: include partial input from an input methodJ-P Nurmi2014-08-081-0/+11
| | | | | | | | | | | [ChangeLog][QtQuick][Important Behavior Changes] TextInput::displayText now includes also partial input from an input method and thus matches with the actual displayed text. Task-number: QTBUG-40329 Change-Id: I407f464938c550d73eba1351283ec751aa293380 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix incorrect acceptableInput value on construction.Aaron McCarthy2014-07-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | The value for acceptableInput was being calculated every time the property value was read. This can lead to situations where the value returned from successive property reads is different even though no acceptableInputChanged() signal is emitted between the two calls. This can be seen during QML component construction where emission of the changed signal is suppressed until the component completes and the value of acceptableInput changes as the other properties are set. If the property is read during binding evaluation an intermediate value can be seen and the QML engine will not re-read the property until after the changed signal is emitted. This doesn't happen until the true value of the acceptableInput property is toggled. Fixed by changing the property getter to returned the precalculated value of acceptableInput and ensuring that this value is set when correctly. Change-Id: Id3ba3a34988ff50f590e4f8330b873f390eaa025 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-221-2/+0
|\ | | | | | | Change-Id: I0dd91626837276f5811e4830f4a4e9f89bf1e1bd
| * Re-enable qquicktextinput test on Mac OS XSimon Hausmann2014-05-211-2/+0
| | | | | | | | | | | | | | | | Fixed in qtbase with commit 40b195d0f9ee7ef1b917a635bb073fa108b2ed40 Change-Id: I4af6080dde9c6356c11f09a6ded86ce9ce28b6e0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Introduce TextInput::ensureVisible(int position)J-P Nurmi2014-05-211-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for TextField to be able to implement text selection handles. TextField needs to be able to ensure that the appropriate character position becomes visible when the handles are moved around. [ChangeLog][QtQuick][TextInput] Added TextInput::ensureVisible(int pos) method to be able to control the scrolling position of a TextInput that has automatic scrolling enabled. Task-number: QTBUG-38934 Change-Id: Id77eafcda6324d10868e0798519e5b712a0d33ed Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Fix tst_qquicktextinput::copyAndPaste() for asynchronous clipboard notification.Friedemann Kleint2014-05-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change qtbase 6a61a00ddb21e79412e82069dfef50192bfd724d for Windows uses new clipboard notification API that results in asynchronous clipboard notifications. Task-number: QTBUG-39145 Task-number: QTBUG-38670 Task-number: QTBUG-33492 Change-Id: I0de78ecba5c67bf6a66f07e59312667f6ce6bf88 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-102-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/accessible/quick/quick.pro src/quick/items/qquickpincharea.cpp src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp src/quick/scenegraph/qsgthreadedrenderloop.cpp Manually adjusted for TestHTTPServer constructor change: tests/auto/quick/qquickimage/tst_qquickimage.cpp Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f
| * If a popup window is opened, do not change the focusShawn Rutledge2014-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | It's not working to have QQuickWindow lose focus every time a menu is opened. This doesn't happen on OSX because menus are implemented as special native ones, but on X11 a menu is another window. In QtQuick Controls it's useful for copy/cut/paste Actions to be enabled based on whether some text has focus. Change-Id: I092b46133b9a8a44639ad9d89ee2bdfe30206bd9 Task-number: QTBUG-36292 Task-number: QTBUG-36332 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Mark tst_qquicktextinput as insignificant on Mac OS XSimon Hausmann2014-04-151-0/+2
| | | | | | | | | | | | | | This will allow further integrations until QTBUG-38363 is fixed. Change-Id: I277628c55b893d199bd1886ee6eb9ff466860a05 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | TestHTTPServer: Make listening an explicit operation that reports failure.Robin Burchell2014-03-211-1/+2
|/ | | | | | | | | | Use this to print the error message when listening fails, and switch to always stack allocating TestHTTPServer instances for easier cleanup. Change-Id: I63b2bd38963b66611dc08a5c322615d91a91e675 Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* Update QQuickTextInput's baselineOffset when only height changesJan Arve Saether2014-02-221-6/+19
| | | | | | | Task-number: QTBUG-36529 Change-Id: I2cd577013c4965e76c9350abaebb9b7a6e4e0270 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fixed wrong baseline alignment for TextInputJan Arve Saether2014-02-121-0/+91
| | | | | | | | [ChangeLog][QtQuick][Fixed wrong baseline alignment for TextInput] Task-number: QTBUG-36749 Change-Id: I6920fb0681f30d9e9943d1bd01f76cc3ae204f30 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* fix whitespaceOswald Buddenhagen2014-01-222-3/+3
| | | | | | | remove trailing spaces and expand tabs Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* tests: update tst_qquicktextinputLiang Qi2013-11-283-92/+140
| | | | | | | | | * add signal_accepted() with validator * update signal_editingfinished() with validator * cleanup many qWait() and etc Change-Id: Ic0a8f1cdc4f1f811501c06513efff9b6217fc749 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* TextInput: call fixup() when appropriateJ-P Nurmi2013-11-271-0/+34
| | | | | | | | | | [ChangeLog][QtQuick] Fixed TextInput to call fixup() on its validator when being accepted or losing focus, and the validator reports that the input is in "intermediate" state ie. the input should be fixed up. Task-number: QTBUG-35128 Change-Id: I4b15406c584a9647bcf892badfaf6d845868fbf1 Reviewed-by: Liang Qi <liang.qi@digia.com>
* TextInput: add editingFinished signalLiang Qi2013-11-222-0/+58
| | | | | | | | | | | | | | | Autotest is included. Task-number: QTBUG-34780 [ChangeLog][QtDeclarative][TextInput] add editingFinished signal Change-Id: Ib633daee67cd4e5f15739a6004adbe882ab3d3fc Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* tst_qquicktextinput/data::maxLength(): Fix assert about zero-width window.Friedemann Kleint2013-09-121-0/+2
| | | | | | | | Occurring with ANGLE-builds. Task-number: QTBUG-32541 Change-Id: Ib48f0c802dd3242a227f8c5d7fda2fccca71403a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-08-061-9/+4
|\
| * Fix tst_qquicktextinput::remoteCursorDelegateRafael Roquetto2013-07-261-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I30adeed2a669d5f6618f56d8a023fe7eaea16bc0 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Fix tst_qquicktextinput for fullscreen platformsRafael Roquetto2013-07-251-4/+4
| | | | | | | | | | | | Change-Id: I42683f69a439608f778fbccf90573173bbc03f5b Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into ↵Simon Hausmann2013-06-241-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Use the platform theme's password mask character for text input fields.Mitch Curtis2013-04-231-3/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-29871 Change-Id: I3b15dfab5ca6455df465c502c93aac7b85a64531 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * TextInput: Fix cursor navigation with maskFrederik Gladhorn2013-04-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | text().length() was used to check if a cursor movement to the right was valid. The problem is that with a mask and not text set yet (inputMask: "#0:00;*") pressing the right arrow would not move the cursor. The input and other functions use the actual d->m_text since that includes the mask length. Task-number: QTBUG-30740 Change-Id: Ic225778e5a49d80b754b63d0eb4a438eaa9818e2 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix expected error messageLars Knoll2013-06-211-1/+1
| | | | | | | | | | Change-Id: I41ebd1506b0d1675cac1205d5fd8f60fd751a4aa Reviewed-by: Simon Hausmann <simon.hausmann@digia.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>
* 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>
| * Stabilize tst_qquicktextinput::remoteCursorDelegate()Frederik Gladhorn2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases QCOMPARE(component.status(), QQmlComponent::Loading); (line 2800) is failing -- it appears to be Ready immediately. Add a delay to ensure it always hits Loading before Ready. This is a backport of change: I975f3b3ea6004f178a7b0fb21193dcbdaf483157 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Backported since the test keeps on failing for the stable branch. Change-Id: Ic90f1fc3de3e0a0ee75026cbebf8d99304a67b98 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Tests: add autotests for TextEdit and TextInputCaroline Chao2013-03-071-0/+44
| | | | | | | | | | | | | | | | | | | | 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>
* | Disable more unstable testsGunnar Sletta2013-03-071-0/+2
| | | | | | | | | | | | Change-Id: I54db72466ca50d65dd39e9c8e25d3a366cb737ea Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-071-0/+8
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/textureprovider/etcprovider.h src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf tests/auto/quick/qquickflickable/tst_qquickflickable.cpp Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
| * Ensure the cursorRectangle is updated as the width of the text changes.Andrew den Exter2013-02-011-0/+8
| | | | | | | | | | | | | | | | | | | | Outside of when of a monospace font is used, if the text changes the visual position of the cursor will have most likely changed as well even when the cursor index hasn't. Task-number: QTBUG-28677 Change-Id: If8077772d8541a677d5875976e6cd9fc453731df Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Stabilize tst_qquicktextinput::remoteCursorDelegate()Michael Brasser2013-02-011-1/+1
| | | | | | | | | | | | | | | | | | In some cases QCOMPARE(component.status(), QQmlComponent::Loading); (line 2800) is failing -- it appears to be Ready immediately. Add a delay to ensure it always hits Loading before Ready. Change-Id: I975f3b3ea6004f178a7b0fb21193dcbdaf483157 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Merge branch 'stable' into devGunnar Sletta2013-01-171-4/+2
|\| | | | | | | | | | | | | | | 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>
| * Fix tst_qquicktextinput on Windows and Mac.Friedemann Kleint2013-01-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Both require a sensible window size. Task-number: QTBUG-23485 Task-number: QTBUG-28611 Change-Id: If888dd4d60fccdabc9856f914d6542ced6a41d64 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.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>
* Renamed QQuickItem::pos property to positionShawn Rutledge2012-11-291-7/+7
| | | | | | | | | 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-41/+41
| | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix QQuickTextInput::moveCursorSelection()Konstantin Ritt2012-10-192-44/+43
| | | | | | | | | | | 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-12/+12
| | | | | | | | Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Fix potential crash when using text and more than 1 QQuickViewEskil Abrahamsen Blomfeldt2012-09-281-1/+1
| | | | | | | | | | | We need to use a resource guard for the FBO in case there is no current context when the glyph cache is deleted. This reverts commit b3264e2cb6a8fe87754aa1335ab9f8d5e3910c14 which was implemented as a band-aid for this crash. Change-Id: I5b3a09a3998da38836ea851cd0978d3ddadcd2cc Reviewed-by: Samuel Rødal <samuel.rodal@digia.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>