aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-17193-193/+193
| | | | | | | | Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Match QRect changeAlan Alpert2012-01-171-7/+0
| | | | | | | | 3b973971fb1e483b9b3514358a415781c3c24ba8 changes the order of data members on mac, the struct we're using to fake QRect needs to match. Change-Id: Id2ecf1726e64514e12dd72980a0c0ad2b693c483 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Added log and status properties to ShaderEffect.Kim Motoyoshi Kalland2012-01-167-87/+227
| | | | | | | Task-number: QTBUG-23531 Change-Id: I136f6d9642ff9d4074fe8dae1f5714a05349107a Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Console API: Add console.infoKai Koehne2012-01-165-3/+8
| | | | | | | | Add console.info for the sake of completeness. It's mapped to qDebug(), just like console.log, console.debug, print. Change-Id: Ife1cfbfe810d4e5e9175343778dff734a56f4a80 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Console API: Autotest reshufflingKai Koehne2012-01-169-149/+277
| | | | | | | | | Move the console tests from qdeclarativeqt to qdeclarativeconsole, and the test for the QML_CONSOLE_EXTENDED property to debugger/qdebugmessageservice. Change-Id: I704bd0a4a28aa1b0eb51df67d32fd6865b114d41 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Remove all reimplementations of relationTo() returning Unrelated.Jan-Arve Saether2012-01-162-6/+0
| | | | | | | | QAccessibleInterface::relationTo() already return QAccessible::Unrelated by default. No need to duplicate that code. Change-Id: Ie64e798a1935619af32ae41d7e14ae26bd9bf523 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix preedit text visibility for TextEditJiang Jiang2012-01-161-30/+55
| | | | | | | | | | | | | For an empty TextEdit with preedit text, we need to add the text separately since the blockIterator will not go through that case. Also fixed preedit text appended at the end of any commited text. Move the code for adding text into SelectionEngine so that we can reuse it for adding preedit text. Task-number: QTBUG-22647 Change-Id: Id4fe04099b16949ff5de0747881c6dc96ef0673f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QDeclarativeExpression: storing column number in expression locationChristiaan Janssen2012-01-1626-61/+89
| | | | | Change-Id: I2d69738158abfc76f80b1cfc0e0ccb145fda2245 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Avoid creating unnecessary copies of TextEdit's text data.Andrew den Exter2012-01-165-24/+29
| | | | | | | | Delay rebuilding the text data from QTextDocument until it is actually requested rather than everytime the contents of the document change. Change-Id: Ibfdc9e9e0372010f0731fb02a223c8b59a67f2c3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Test more of QQuickImageParticleAlan Alpert2012-01-164-4/+128
| | | | | | | | | | | | | Now the color variance properties are tested, as is the debug code. Just running the debugging code is valid testing, as it contains pointer derefernces that could cause runtime errors, and this codepath is not always enabled at runtime. Additionally, debug mode control has been consolidated in the ParticleSystem. However, this was not necessary for this test addition. Change-Id: Ie56465145461486456462154dfafe546fedabcba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Wait for polish at the start of addOrRemoveBeforeVisibleAlan Alpert2012-01-161-0/+1
| | | | | Change-Id: I1cf13af7e9b854cee7754b31643438eab3085084 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Handle views with negative width/heightMartin Jones2012-01-164-19/+77
| | | | | | | | | A view with a negative d->size() would get stuck in an infinite loop. Also make sure item layout/visibility is updated when the view size changes. Change-Id: I1f16a714ecebe1c4b71902c460e27fb0f1c4406f Reviewed-by: Bea Lam <bea.lam@nokia.com>
* lower case QML components are accepted when used with 'as' importMatthew Vogt2012-01-1619-6/+66
| | | | | | | | | If an Object Binding is in a namespace, ensure that the Component name begins with a capital letter. Task-number:QTBUG-20786 Change-Id: Id4a0c0fdb0c9b9516bea597a4994bb7519339bc9 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix build break in qmlviewer.Xizhi Zhu (Steven)2012-01-141-0/+1
| | | | | | | It's introduced by commit 14b929e9c448f2cc74fa047aaf8af283b81fbaf9 in QtBase. Change-Id: Iacb5350b5f42a09b7419bf491ac9620a406422e6 Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
* Stabilized tst_qquickcanvasSamuel Rødal2012-01-131-33/+45
| | | | | | | | For some reason the mouseFiltering() and headless() cases fail if the touch test cases run first. Change-Id: I30839b09e9f7b287c88e6983424add5cf40a6d1a Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QTouchEvent::TouchPoint::isPrimary() is gone.Samuel Rødal2012-01-131-1/+1
| | | | | Change-Id: I6fbaac28a060fd527e0226d55419a9055125368a Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Reintroduce plugin support for asynchronous hardware specific texturesGunnar Sletta2012-01-135-80/+110
| | | | | Change-Id: Iad36542d2137e7a6470009c308ece3de389907c1 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add tests for item polish bug on MacBea Lam2012-01-135-8/+52
| | | | | | | | | | | | | On Mac OS X, if a QQuickItem triggers a polish request from Component.onCompleted, its updatePolish() function is not called. The tst_qquickitem::polishOnCompleted() test demonstrates this. If a running animation is added to the polishOnCompleted.qml in the test, the test will pass. Task-number: QTBUG-23481, QTBUG-23480, QTBUG-21590 Change-Id: I172b12e784aa458c43c23e0ee43f034f0bd332ee Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't delete global appCharles Yin2012-01-131-1/+4
| | | | | | | | Sometimes delete the global GUI app causes crash, this is a work around fix. Change-Id: Ic2406e7a085483de5d96321de8257663925b7e5e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Use QGuiApplication, not QApplication, in testsDamian Jansen2012-01-1310-92/+92
| | | | | Change-Id: I7802293e6cafb90686c103972bc036cf74184714 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Disable an unstable test.Gunnar Sletta2012-01-121-0/+1
| | | | | Change-Id: I2f346ce26bfb23e148cb5b0ad73a934930a4fdf7 Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Fix preedit text visibility when TextInput is emptyJiang Jiang2012-01-121-1/+1
| | | | | | | Task-number: QTBUG-22646 Change-Id: I5162ffdebdee6f956a9a79b2307a2ac53cc4890b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* initialize variableGunnar Sletta2012-01-121-0/+1
| | | | | Change-Id: I4841dce8e85df608fd0e38f661301797a3857176 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove out-of-line uses of qMalloc/qFree/qRealloc.Robin Burchell2012-01-1210-33/+33
| | | | | | | | | Per http://codereview.qt-project.org/#change,11562, we are trying to remove these in favour of direct allocation, or (in the case of inline code) specialised out-of-line wrappers. Change-Id: I113609c4f97dc5c8020a72cbd398572cdb5b7505 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Adapt to QInputPanel::inputDirection() APIPekka Vuorela2012-01-1215-31/+34
| | | | | | | Information moved from QGuiApplication into QInputPanel. Change-Id: Idd80609f4b67bffae7222a1fa27918724ebf60f6 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Accessibility: indexOfChild is 0-based.Frederik Gladhorn2012-01-124-6/+9
| | | | | | | Also test for it to work. Change-Id: I3be913984e2dddce241b538c7801f3376acdd1fa Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Remove unnecessary reimplementation of invokeMethod()Jan-Arve Saether2012-01-122-7/+0
| | | | | | | | invokeMethod() is not pure virtual, and the implementation inherited from the baseclass is the same Change-Id: I073ab3a0dc3477f66b82535c1898430f601acee8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Make QAccessibleQuickView::childAt() work properly with overlapping itemsJan-Arve Saether2012-01-127-45/+309
| | | | | | | | | | | | | | | | | | | | The previous code did not consider items that were overlapped due to having different z coordinates. The approach used is now the same as found in QQuickCanvas::mousePressEvent(). Strictly speaking, this is a violation of childAt (since it will disregard the implementation of childAt of all the descendants along the path down to the item actually returned.) However, I don't see any good reason for that the implementation for childAt() would be different than how mousePressEvent behaves. It should also perform better than any other solution I managed to think of. Change-Id: I2d3fa2282437c7b5533c6149c62fc456ccf2ccfa Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix validators not allowing backspace or delete.Andrew den Exter2012-01-123-4/+47
| | | | | | | | | | TextInput will allow non-valid changes to already invalid text, when a validator is changed update the current validity so changes can be made to bring the text back to a valid state. Task-number: QTBUG-22080 Change-Id: I501961b473f58c317bce474b1df8d91fd1f967d4 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add undo and redo functions to TextInput and TextEdit.Andrew den Exter2012-01-129-47/+235
| | | | | | | | | The functionality already existed and was usable through keyboard short cuts but was not accessible through API. Task-number: QTBUG-16191 Change-Id: I080fa2ddb76668a7a632aa7477004f99037ea68b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove QEXPECT_FAIL from TextEdit test.Andrew den Exter2012-01-121-2/+0
| | | | | | | | Test doesn't assert. Task-number: QTBUG-22058 Change-Id: I28ca74884ed9f42ff35789be82e99dbdf84055c3 Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Fix restarting timer from onTriggered handler.Andrew den Exter2012-01-122-1/+60
| | | | | | | | | | Set the running property to false before calling the triggered handler when a timer finishes so it does not appear to still be running and can be restarted by setting the running property to true. Task-number: QTBUG-22004 Change-Id: I840efa30f5b7ad7d0cda96803d4898be3f390705 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix failing tst_qquicktextinput::horizontalAlignment_RightToLeft test.Andrew den Exter2012-01-122-20/+27
| | | | | | | | | | How the text is laid out is dependent on the horizontalAlignment so that needs to be determined before updating the display text and doing the layout. Task-number: QTBUG-23485 Change-Id: I1872b1bfc60fd829a0d69c21a19cd3b2b4dc8340 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add Two MultiPointTouchArea examplesAlan Alpert2012-01-1214-0/+539
| | | | | | | | Bear-whack and multi-flame. Still missing an example using a custom gesture and the signals. Change-Id: Ie75c57e34adab3a62f66eba586a1b2de51dbe100 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix QQuickAge testAlan Alpert2012-01-122-3/+1
| | | | | | | | | | | | With the consistent timing bug fixed (ages ago), test should be stable. A problem leading to failures in sustained has also been fixed (assumed that the particle group size would be approximately 500, but this is not necessarily true). Task-number: QTBUG-22088 Change-Id: Ifdb0f0e08266f9e44782c6b8fc8c56200c0a1d46 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update text autotests.Michael Brasser2012-01-122-8/+0
| | | | | | | | QTBUG-18040 has been fixed for Qt 5, we no longer need to skip these tests on Mac. Change-Id: Ie1883a75b105ca321388b3c4483110306e2a387c Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Skip crashing test on Mac.Andrew den Exter2012-01-121-0/+3
| | | | | | Task-number: QTBUG-23010 Change-Id: I0e0513e50664421522c104163a28c3fa88b5c469 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Stabilize test.Michael Brasser2012-01-121-3/+0
| | | | | | | | | There appears to be an issue with showing before setting the source, if qWaitForWindowShown is not used. The show() is not required for this test, so remove it. Change-Id: I423a9572c8ee0dde9cbf9bc8fbf98aede97a79a7 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Remove obsolete toBoolean() and isBoolean() QJSValue gettersSimon Hausmann2012-01-114-86/+58
| | | | | | | We should use "toBool" and "isBool" for consistency with QVariant. Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* QMLTest: Fix output of file names, make output more verbose.Friedemann Kleint2012-01-113-72/+107
| | | | | | | | | | | | | | | - Check command line arguments thoroughly. - Change all QuickTestResult functions taking file names to accept QUrls and format them using QUrl::toLocalFile() in case of local file names in order to display Windows drive letters correctly. - Introduce a template function (for QDeclarativeView, QQuickView) that dumps out all available information when compilation goes wrong. - Skip 'Debug', 'Release' folders for Windows builds. Change-Id: Ibdd92867870a2b05494de8a0adbe0910d4897ba2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Improve Accessibility documentation.Frederik Gladhorn2012-01-101-1/+5
| | | | | Change-Id: I41a48a69c1de34b37bcb4a703f844647d8c61456 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Accessibility: Checked state for check boxes and radio buttons.Frederik Gladhorn2012-01-1010-67/+142
| | | | | | | Also adapt to new api in qtbase - state is now a bit field. Change-Id: Ia4266f3d5094a6c32e0ace3499910b57c3e71c25 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Remove the pin to qtbase and depend on the new qtjsbackend moduleSimon Hausmann2012-01-101-1/+2
| | | | | | | This module contains our V8 dependency. Change-Id: I72b0b64fe61fe10139725d24711ea24a8a035eb4 Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
* Fix tst_qdeclarativestates::anchorsRewindBug failureGunnar Sletta2012-01-093-39/+35
| | | | | | | | | | | | | | | | | | | | maybeUpdate() has an optimization to void locking the Gui thread on every QQuickItem::update() call, which was faulty. When the render thread was done rendering the flag should have been reset which would have meant another locked sync between render and GUI. Solve it slightly differently by posting an event to ourselves in GUI and resetting the state once the event is processed. This batches all update calls made until the GUI thread returns to the event loop, aka all animation updates, all responds to one touch event, etc. The isExternalUpdatePending variable, written from maybeUpdate, was accumulated per canvas, but is used per render thread only, so this change simplifies the variable to be per render thread only. Task-number: QTBUG-23478 Change-Id: I067a9918383e3e05e2feebcc6dfa3163b032eb5b Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QQuickListView is unstable when run as parallelGunnar Sletta2012-01-091-1/+0
| | | | | Change-Id: I4d7e31e69f4b71d5ecf2113b90343e10320e8056 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Avoid storing a deep copy of the image in the texture objectGunnar Sletta2012-01-091-7/+8
| | | | | Change-Id: I605445ea23493fd562a7fe2b3cc841ad21e5b08b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QDeclarativeDebug: Add a debug message service.Aurindam Jana2012-01-098-3/+477
| | | | | | | | | | | QDeclarativeDebugMsgService installs a QtMsgHandler which forwards debug output to a client defined port only if the service is Enabled. It also forwards the debug output to the previous message handler. Effectively, this service just eavesdrop on debug output, forwarding it to a port only if a client is connected. Change-Id: Ie0ee7bab57ef8f03a2de34d91921f054a7ec147f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Pin qtdeclarative to a version of qtbase that still contains QtV8Simon Hausmann2012-01-091-1/+1
| | | | | | | | This is a temporary measure until the new qtjsbackend module is fully in place. Change-Id: I5cfe277ee6a14680f378dd4d4c0f94dfa56fbac3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix positioning issues and change content y repositioning behaviourBea Lam2012-01-096-159/+562
| | | | | | | | | | | | | | | | | | | | | | | Refactor the code for re-positioning the visibleItems.first() in QSGItemView::applyModelChanges() and fix various positioning issues. The positioning behaviour for removing items at the start of the view has changed. This action will no longer cause the content y to move down; previously the content y would always move down unless another item was moving backwards to the first visible position. This will make it easier to implement built-in removal transitions for the views, since removed items cannot be animated if the content y jumps down past them. Additionally, moving items from before a GridView should not cause the top item in the view to move upwards and out of the view. This also adds additional remove tests and fixes the tst_QQuickGridView::moved() test which wasn't waiting for the polish event after setting the content y, which caused some of the tests to pass even though their test data was wrong. Change-Id: Idad11a73a18f88208e73a52111ed839458e05f2d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix QQuickItemParticle timing issuesAlan Alpert2012-01-093-13/+18
| | | | | | | | | | | It was possible for m_loadables to be reset before the items were loaded, and the datum pointer was lost. This was exacerbated by another bug where reset was called every frame for no reason. Both bugs are now fixed. Task-number: QTBUG-23491 Change-Id: I9b60858621b697fc46de1e964cb27ddc0d2dbc65 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>