summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into animation-refactorwip/animation-refactoranimation-refactorMichael Brasser2012-01-25833-2058/+4167
|\ | | | | | | | | | | | | Conflicts: tests/auto/declarative/declarative.pro Change-Id: Ie339be2989fac553d351f3077869f1847367b504
| * Allow JS API in modulesMatthew Vogt2012-01-2411-73/+266
| | | | | | | | | | | | | | | | | | Allow modules to export verisoned javascript code into specified namespaces. Task-number: QTBUG-20857 Change-Id: Ic968c697ba36cbc4535870ed5eed2fe7f01af11d Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Fixed crash in QDeclarativeGridViewMartin Jones2012-01-241-1/+1
| | | | | | | | | | | | | | | | Inserting new items used a different threshold than removing items outside the view in refill. Change-Id: I3712837820a1e1a6af280d33d29bd9e01e559691 Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Update for glyphMargin() migration in qtbaseJiang Jiang2012-01-241-1/+1
| | | | | | | | | | | | | | | | glyphMargin() has been moved from QTextureGlyphCache to QFontEngine in qtbase. Update private API usage for that. Change-Id: Ia74c1387eaad4cb961ca0fe36905254edb351258 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Adapted QQuickScreenAttached to orientation API changes in QScreen.Samuel Rødal2012-01-242-16/+21
| | | | | | | | | | Change-Id: Ic2cb008b989780e297f03ddd5bdef466bb230c74 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Add missing include.Stephen Kelly2012-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes build after requirement for Q_DECLARE_METATYPE(T*) to be fully defined. In QtBase (4b8ceb41aed352f10d36db5284453f425dbc5f3f) Change-Id: I7ea42ec45797fafdde94ea5b58c6c71640710196 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Console API: Add console.exceptionAurindam Jana2012-01-243-0/+12
| | | | | | | | | | | | | | | | | | console.exception writes a message to the console and prints the JavaScript stack trace at the point where it is called. Change-Id: Idd2ff5982826accae0895db44c7ecf6130338cc7 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Console API: Add console.assertAurindam Jana2012-01-243-13/+41
| | | | | | | | | | | | | | | | | | console.assert tests if an expression is true. If it is false, it writes a message to the console and prints the JavaScript stack trace at that point. Change-Id: I5487552cb8a947e1947914166834e0bdedba3354 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Add support for shared glyph cacheEskil Abrahamsen Blomfeldt2012-01-2420-21/+913
| | | | | | | | | | | | | | | | Use a shared graphics cache to back the distance fields if it is available. Change-Id: Id5e6e7a28e38e349d787e66016b2d0faebc791d7 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Don't hang the worker script engineCharles Yin2012-01-243-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | 1. Wake up the syncDone wait condition when delete the QDeclarativeListModelWorkerAgent, otherwise the the whole worker script engine thread will hang at the sync() call and can't exit gracefully. 2. Call QCoreApplication::processEvents() before delete the worker script engine to cleanup all pending events in main thread to release wait conditions which some worker scripts/agents are waiting for (QDeclarativeListModelWorkerAgent::sync() for example) Change-Id: Ia3712318771633e68238b4d629ba870ff7ce45b9 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
| * Remove Symbian specific code.Xizhi Zhu (Steven)2012-01-249-57/+10
| | | | | | | | | | Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * TextInput documentation fixDamian Jansen2012-01-241-6/+6
| | | | | | | | | | | | | | A few instances where TextEdit is indicated Change-Id: I6d6a6c1f92d673978856befb9c2581b657cdb0f7 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Call new pass/fail/skip count function in QTestLog.Jason McDonald2012-01-241-4/+4
| | | | | | | | | | | | | | | | The passCount, failCount and skipCount functions have moved from QTestResult to QTestLog. Change-Id: I0dbf8b43521f81dc29e20bb7547ff9f213487007 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Avoid using QTestResult::ignoreMessage().Jason McDonald2012-01-241-1/+1
| | | | | | | | | | | | | | | | | | QTestResult::ignoreMessage() is just a wrapper around QTestLog::ignoreMessage(). Both are private API, so just call the latter directly so that the former can be removed from the API. Change-Id: Icf77e2bf656afc556205ddf0dda5bb48fdbdfbbf Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Console API: Add console.countKai Koehne2012-01-244-13/+58
| | | | | | | | | | | | | | | | console.count can be handy to check how often code snippets are executed. Change-Id: I0eaf17ab893c76e7b8956122aa31e218745e92bf Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Avoid compiler warningsPekka Vuorela2012-01-241-1/+2
| | | | | | | | | | Change-Id: Iedc015e4be2fe80cef7a3e26c0a0747615891f7b Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
| * QQuickCanvas::event should return true if the touch event was acceptedAndras Becsi2012-01-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | If QQuickCanvas::event delivers a touch event and it is accepted the control ends up in QWindow::event which invalidates the event. These touch events end up as if they were unhadled which causes Qt to automatically synthesize mouse events even for accepted touch events. Add a unit test for testing this behavior. Change-Id: I83d4aeafee1ea7ec5d219e4b45aae699188717c3 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Add some internal docs for the particle system and sprite engineAlan Alpert2012-01-232-0/+70
| | | | | | | | | | | | | | | | They're both large internal structures with extensive logic. Should have at least a basic attempt at documentation (beyond inline comments). Change-Id: I7d48ebf821fa759c11fa35889dbff8971644d23e Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Per-frame Sprites patch threeAlan Alpert2012-01-234-36/+120
| | | | | | | | | | | | | | | | | | interpolation bools work with the new sprite rendering approach. Giant sprite images that get split into multiple rows now work with the new sprite rendering approach (or even at all). Change-Id: I7f3e09684622f523564802c7634361b6fe363676 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Remove unecessary assertsAlan Alpert2012-01-231-2/+0
| | | | | | | | | | | | | | | | They would also trigger when the user gives invalid input, which is not an assert worthy circumstance. Change-Id: Ifa5697d411793a55b6895945e751a73841b1ba3f Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Per-frame Sprites patch twoAlan Alpert2012-01-233-66/+77
| | | | | | | | | | | | | | | | | | Implements CPU sprite advancement in SpriteImage, and covers the manual sprite advancement codepath in an autotest. Task-number: QTBUG-22236 Change-Id: I52a8ca3f923e88232238f9e158863b1ba7c0441b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Per-frame Sprites patch oneAlan Alpert2012-01-238-125/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow for sprites to be advanced by the rendering framerate, two minor redesigns were needed. A) Sprite texture location is now calculated on the CPU and passed to the GPU per frame. B) Stochastic State engine now supports states that do not advance on a timer, and states can be advanced manually. This patch implements B and A for ImageParticle. A for SpriteImage will be done in a separate patch. Task-number: QTBUG-22236 Change-Id: If1c54a6a03fa48b95bb1e672283292859656457b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Update obsolete contact address.Jason McDonald2012-01-23827-848/+848
| | | | | | | | | | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Avoid anchor/positioning loopsAlan Alpert2012-01-231-7/+11
| | | | | | | | | | | | | | Task-number: QTBUG-23740 Change-Id: I84922ac2dc6e499fc22b923298ca31eda382c622 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Mark deprecated functions in QJSEngine and QJSValueKent Hansen2012-01-204-38/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | This functionality will be removed or renamed in the final Qt 5 API. From this commit and with deprecated warnings enabled (DEFINES += QT_DEPRECATED_WARNINGS), it's easy to see how existing users of this API (e.g. qtjsondb) are affected. Task-number: QTBUG-23604 Change-Id: I242c43377bb34ddcca84b6ed5b7ef9fbf2017a83 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Add QJSValue::callAsConstructor() functionKent Hansen2012-01-204-27/+38
| | | | | | | | | | | | | | | | | | | | The old name, construct(), was bad. This name is more descriptive and consistent with the other callXXX() functions. Task-number: QTBUG-23604 Change-Id: Ie205b0c52721782101e665f7dfedcac9051a00d0 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Add QJSValue::callWithInstance() functionKent Hansen2012-01-202-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With the deprecated call() overload, it was confusing what the first argument was (the this-object or an actual argument passed to the function). Introduce a dedicated function for the "explicit this-object" case. This makes code more readable, and eliminates the need to pass a "dummy" this-object to call() in the quite common case where you don't care about the this-object. Task-number: QTBUG-23604 Change-Id: I18f8be6592a848436351516bea266fc7e9195777 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Add QJSValue::call() overloadKent Hansen2012-01-202-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | This overload takes only an argument list, not a this-object, since that is a very common way of calling stand-alone ("non-member") functions. Now there is no longer a need to pass a dummy value for the this-object. Task-number: QTBUG-23604 Change-Id: Iae952d91fce5bcaa62a05b9978c15f32802da90a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Add QJSValue::isCallable() functionKent Hansen2012-01-202-3/+16
| | | | | | | | | | | | | | | | | | | | | | This replaces the isFunction() function. isFunction() will be removed. It's possible that objects are callable even if they aren't Function instances. Also, "isCallable" is consistent with call(). Task-number: QTBUG-23604 Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Add QJSValue::toInt() and toUInt()Kent Hansen2012-01-203-5/+31
| | | | | | | | | | | | | | | | | | | | These replace toInt32() and toUInt32(), which are obsolete and will be removed. Task-number: QTBUG-23604 Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Add QJSValue::deleteProperty() functionKent Hansen2012-01-202-1/+30
| | | | | | | | | | | | | | | | | | | | | | This makes it possible to delete a property without relying on passing a QJSValue of invalid type to setProperty() (the invalid type is going to be removed). Task-number: QTBUG-23604 Change-Id: I653b3349050ad1aac1cf6ccc8547c753abbb9f1d Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Add QJSValue::hasProperty() and hasOwnProperty() functionsKent Hansen2012-01-204-1/+52
| | | | | | | | | | | | | | | | | | | | These functions provide a way of querying whether a property exists, without relying on the QJSValue invalid type (which will be removed). Task-number: QTBUG-23604 Change-Id: I2efd53a1e54cc202ecc022d12730b2775384cf53 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Build fix.Jędrzej Nowacki2012-01-201-1/+0
| | | | | | | | | | | | | | | | QBool was removed from QtBase in change I6642f43f (Remove QBool and use bool instead) Change-Id: Ia4c5d12fae8779d7e8c880755cd16e215f073a6d Reviewed-by: David Faure <faure@kde.org>
| * Added a few material flagsGunnar Sletta2012-01-204-3/+11
| | | | | | | | | | Change-Id: Id324ebb82df985f1a7380761cc4923f60c7d1f20 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * Use queryAccessibleInterface instead of new QAccessibleQuickItemJan-Arve Saether2012-01-201-7/+2
| | | | | | | | | | | | | | | | | | In some cases this could prevent us from actually returning the expected QAccessibleQuickItemValueInterface. This is also more future-proof in case we add more QAI subclasses. Change-Id: Id66dc21418671a3045d93c0a44dc74aa0aff30af Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Doc: Improve Qt.locale docs.Martin Jones2012-01-201-2/+2
| | | | | | | | | | Change-Id: I3ef5c4a0bedbaa346b001852bba8e9ff9347e9e0 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Remove the use of QT_MODULE()Gunnar Sletta2012-01-20119-119/+0
| | | | | | | | | | Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Update TextInput.acceptableInput on component complete.Andrew den Exter2012-01-202-22/+57
| | | | | | | | | | | | | | | | | | | | | | | | QValidator doesn't notify when it's validation criteria changes so is susceptible to order of evaluation issues. Deferring the initial validation will ensure validators with static criteria are correctly applied. Notification from QValidator on changes would solve this for all cases: QTBUG-23694. Task-number: QTBUG-21103 Change-Id: I920f36645fd18ce809db56b5daf73545f1d603dc Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Fix lockup in views due to endless polish loop.Martin Jones2012-01-205-84/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | It was possible to cause an endless polish loop in some rare cases. Eliminate all calls to polish() within existing polish() code paths. Cleanup delegate creation and cancelling in the cacheBuffer area. Adjust first item position correctly when inserting/removing before visibleItems list. Change-Id: I508a2e6de8cb09d904466cbf5fb6b5dfd1e89c49 Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Assigning empty object to Q_PROPERTY(QVariantMap)Matthew Vogt2012-01-191-7/+8
| | | | | | | | | | | | | | | | | | Correct the evaluation of an empty javascript object during assignment to a QVariantMap property. Task-number: QTBUG-23586 Change-Id: Ifa891a017690a36bd5837bc6b4dd0e47eb515a46 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Extend the documentation on DoubleValidator.Andrew den Exter2012-01-191-0/+17
| | | | | | | | | | | | | | | | Elaborate on what is valid, intermediate, and invalid. Task-number: QTBUG-22081 Change-Id: If0ef270eaee60b530fdf6275e36b2208d41c7639 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Add a baseUrl property to Text and TextEdit.Andrew den Exter2012-01-196-3/+104
| | | | | | | | | | | | | | | | | | Specifies the base URL which embedded links in rich text are resolved against. By default this is the URL of the item. Task-number: QTBUG-23655 Change-Id: Ib51b8503a18d9ac4e1801c77b77b3595d8f4912a Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Don't load embedded images from the current working directory.Andrew den Exter2012-01-197-29/+132
| | | | | | | | | | | | | | | | | | | | | | Override QTextImageHandler's image loading as it will attempt to resolve relative paths and load the image itself if the document returns an invalid image from loadResource, which we don't want as it bypasses the pixmap cache and resolves against the application and current working directory instead of the Text items context. Change-Id: Ia1d3633036f96d902e1ac03dae5d5b203fba7ff1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Change testlib skipAll function to failure.Jason McDonald2012-01-191-5/+3
| | | | | | | | | | | | | | | | | | | | Be more insistent that tests using the obsolete skipAll() function should change to using skip() by treating calls to skipAll() as test failures. After a further grace period the skipAll() function will be removed. Change-Id: Ic2448af2f8176909afa151b6e8c29587dfd17f1f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Use mediump in distance field shaders for the alpha threshold.Yoann Lopes2012-01-181-12/+12
| | | | | | | | | | | | | | lowp or highp cause some problems depending on the hardware. Change-Id: I2762c04548656de8fdb34711f52e5cf05d8c2ac5 Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
| * The rendering signals must be direct connections.Gunnar Sletta2012-01-181-2/+2
| | | | | | | | | | Change-Id: I6fd492096e21dfe1580d003cd9165a2d4c7f37dc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Allow QML URLs to contain pre-encoded octetsMatthew Vogt2012-01-184-14/+44
| | | | | | | | | | | | | | | | | | Use QUrl Tolerant parsing mode to permit user-supplied URLs to contain pre-encoded octets which are not mangled by string conversion. Task-number: QTBUG-22756 Change-Id: I4b160b04340b95221d1eb3336bda8c0b38d2e232 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Insertions were calculating wrong insertion posBea Lam2012-01-184-87/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After removes, and after each insertion, the view must adjust the visibleItems.first() position and call layoutVisibleItems() to ensure that the correct insertion position is calculated for insertions that follow. When applyInsertionChange() in GridView and ListView calculates the position for item insertion, it looks at the current positions of the items in visibleItems, so these positions must be updated prior to this calculation. Otherwise, insertions that follow a remove may not calculate this position correctly and will neglect to add some items, and multiple insertions may unnecessarily create items at positions that are not actually visible. resetFirstItemPosition() is changed to take a set position and it replaces resetItemPosition() since it can do the same thing. Task-number: QTBUG-23610 QTBUG-23609 Change-Id: I8839ee7d15853301435e80c0dc563f93fc3605cf Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Made QQuickTextInput follow input direction changesPekka Vuorela2012-01-173-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | Cursor of empty field should align based on input method direction. Now input method allowed to change direction on run time. Also earlier cursor wasn't properly drawn on correct alignment at all. Change-Id: I4601f10e6b5dde09591bd484b05f001add6c1573 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
| * QQuickTextEdit to follow input method direction changesPekka Vuorela2012-01-172-0/+19
| | | | | | | | | | | | Change-Id: I458f85452a2ffe1c43438f9588cfc271461a42c6 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
View Lorry Controller Status