aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Homogenize examplesAlan Alpert2012-02-0627-5/+431
| | | | | | | | Several groups of examples are now organized like the other Qt examples, with a project file, doc entry, and single launch point. Change-Id: I2fd957c00e0d1121ebe47c806e54e6999425d1d3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix acceptance of unhandled mouse events.Simon Hausmann2012-02-062-1/+44
| | | | | | | | | | | | Mouse events not handled by the canvas need to be ignored, in order for features like touch synthetization to work. In case of the initially delivered mouse press event, the canvas did not ignore the event if it was not handled. This patch corrects that and adds an auto-test to verify the new behaviour. Change-Id: I8499701f5a161ce1e90a70303aa7ca4ccf2f0b6f Reviewed-by: Andras Becsi <andras.becsi@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Warnings in the before/afterRender docsGunnar Sletta2012-02-061-4/+11
| | | | | Change-Id: I2311e574b45d518893ef868fdcf51053dc43bb13 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Don't start timers in the QDeclarativePixmapStore destructorTor Arne Vestbø2012-02-061-0/+5
| | | | | | | | | | Timers use global static data, which might have been torn down at the point where we start the timer. Change-Id: Id11de05ae92b9a3652f9b1d7c3d5ca4947ffe065 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix updating text color in Text elementEskil Abrahamsen Blomfeldt2012-02-061-1/+3
| | | | | | | | | | The setColor() function in QQuickText calls markDirty() which did not specify that the whole paint node should be updated, so color updates would have no effect until something else changed. Change-Id: I93741b6c697f2dd6ad5a315250502a7a6e3ce1d7 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix vertical offset of TextInput.positionToRectangle.Andrew den Exter2012-02-062-4/+58
| | | | | | | | | Offset the y value of the rectangle by the vertical scroll and line offset. Task-number: QTBUG-23934 Change-Id: I43815b480f43a089a9a03b0aec32dfc0598b6154 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix TextEdit vertical alignment.Andrew den Exter2012-02-063-3/+28
| | | | | | | | | | Don't ignore the position of a QTextDocument when contructing a text node, and translate the rectangle returned by positionToRectangle by the y offset. Task-number: QTBUG-23935 Change-Id: I55a2b69a32a8b623be7e36de54ad083c2f8591e5 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add support for resizing fonts to fit Text dimensions.Andrew den Exter2012-02-066-166/+1000
| | | | | | | | | | | This adds a mode where if the content of a Text item doesn't fit within its bounds the font size is reduced during layout until it does or a minimum font size is reached. Task-number: QTBUG-22832 Change-Id: I6198ef03899e2f21b32e313548966ef4b0e3bff1 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Fix some QJSValue test failures.Glenn Watson2012-02-061-2/+10
| | | | | | | | | | | Fix precision issues causing test failures on platforms where qreal is defined as single precision. Also use explicit casts to ensure well defined behaviour when converting a negative double value to an unsigned integer. Change-Id: Ia0048bf83169d3b617f70828f86368c23f4f3786 Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix incorrect ref count with dynamic roles on worker thread.Glenn Watson2012-02-061-0/+3
| | | | | | | | | | When using the dynamic roles mode from a worker script thread, the reference count for the list model worker agent was not being incremented correctly, causing the final release of the agent to be reading from memory that had already been freed. Change-Id: I06d8e363c95133c1c162f32e1efb2d4020ed96be Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add a grouping examples launcher for animation examplesAlan Alpert2012-02-066-0/+286
| | | | | | | | | | | Components are designed to be reusable, so that other categories might use them to create grouping launchers. Single grouped launchers fit better into the Qt examples style that QtCreator and qdoc are expecting. Change-Id: Ia6935394caa1856aa8cc105746dd3d30fd0b8c7c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove SVG use from exampleAlan Alpert2012-02-064-136/+2
| | | | | | | | With the SVG module now an optional dependency, examples that don't need SVG shouldn't use them. Change-Id: I17ad57dec6982e78090904d1514e28233c354b5b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update BearWhack spritesAlan Alpert2012-02-061-3/+3
| | | | | | | Missed the API change on duration Change-Id: I64abcdad3f0e9554f797868761a06b9ed8662762 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Teach build system tst_qdeclarativepixmapcache needs QtConcurrentAlan Alpert2012-02-061-0/+3
| | | | | | | So if QtConcurrent is disabled, this test should be too. Change-Id: Ib4c6a952f73fc21bb201cf6017cd3e73732fbe7b Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Add "QT += concurrent" to a test that needs itAlex Wilson2012-02-061-1/+1
| | | | | | | | QtConcurrent became its own module in qtbase as of http://codereview.qt-project.org/15206 Change-Id: Ie9b638d83012aa83f854b92fec80d48babcf6ef0 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Cleanup: remove some debugging and use QQuickTextNode::addImageYann Bodson2012-02-061-17/+2
| | | | | Change-Id: I20f38f590b158d5d615923c30e85e2a7cfd99763 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Skip tst_qquickitem::simpleFocus on Mac OS X 10.7Yann Bodson2012-02-061-0/+5
| | | | | | | Task-number: QTBUG-24094 Change-Id: I521707891d2695d7dde8eea4ef8a6a2e3f5ea935 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix crash bug related to QDeclarativeListModelCharles Yin2012-02-035-44/+82
| | | | | | | | | | If QDeclarativeListModel is deleted, all references to this object in QDeclarativeListModelWorkerAgent and WorkerScript objects should be removed and additional checking is needed when process the pending sync() events. Change-Id: I12b1f06699cc908e684af0886cf06d811c3fceb4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Ensure || expressions in v4 will always exit.Michael Brasser2012-02-033-0/+31
| | | | | | Change-Id: I7188e38403fec96f83f3bdfc68b763a9aec9346a Task-number: QTBUG-24038 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Cleanup text examplesYann Bodson2012-02-032-13/+12
| | | | | | Change-Id: I66797c9cf8b2c3a502a31c442d9e51d7febfe368 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031736-167783/+222
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix spelling errors that refer to non-existent symbolsMatthew Vogt2012-02-022-2/+2
| | | | | | | | | These erors create the appearance of symbols that do not actually exist. Task-number: QTBUG-23737 Change-Id: I249742998524b6156185a6601f36e7691013ddf3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Started implementation of offscreen canvas FBO rendering APIGunnar Sletta2012-02-023-9/+76
| | | | | Change-Id: I15b1799982d20d16c9c5e08eee7095cf087b49e1 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Do not start timers in QDeclarativePixmapStore teardownLaszlo Agocs2012-02-021-2/+5
| | | | | | | | | | The store instance is a global static and so starting timers during its destruction is unnecessary, and may cause crashes if the QAbstractEventDispatcher's statics are already destroyed. This happens on OS X at least. Change-Id: I785515c8973b291a7bfc6c5dabe2c19e8393c7ad Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Adapt to QGuiApplication::focusObject() for notifying input methodPekka Vuorela2012-02-027-87/+61
| | | | | | | | | Emitting focusObjectChanged() signal now instead of explicitly setting inputItem to QInputPanel. Also adapted from deprecated QInputPanel::inputItem() to QGuiApplication::focusObject(). Change-Id: I97460625cc8bb2820ec7716a06330aecd1b585ea Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove QAccessible::FocusChild, add focusChild()Jan-Arve Saether2012-02-022-23/+18
| | | | | Change-Id: Idc96d91ec31630b4240fe473ed3b4bf0a4753618 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Remove QJSEngine::undefinedValue() functionKent Hansen2012-02-024-53/+32
| | | | | | | | | | | | | | | | Rationale: It's strange to have an undefined value factory function. There should just be one way of constructing undefined values: By passing UndefinedValue to the QJSValue constructor. The undefinedValue() function created a value that was bound to the engine; the QJSValue constructor does not. In order to ensure that we're testing the same behavior as before, I've replaced undefinedValue() calls by toScriptValue(QVariant()) in the autotests. Task-number: QTBUG-23604 Change-Id: Ie9295b7af49c853b5a4a3445da48c325fef8d6b1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Remove QJSValue::isFunction() functionKent Hansen2012-02-022-18/+0
| | | | | | | | | | Rationale: QJSValue::isCallable() should be used instead. There is no compelling reason to be able to distinguish between JS Function instances and other callable objects. Task-number: QTBUG-23604 Change-Id: Ieef6b32030ef70f54081035fd4ffc3c17c184cd3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Remove QJSValue::construct() and deprecated call() overloadKent Hansen2012-02-022-29/+1
| | | | | | | | callAsConstructor() should be used instead. Task-number: QTBUG-23604 Change-Id: If95ab9906712ede7cbae5e9d24624708bccf880f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Remove QJSValue::toInt32() and toUInt32() functionsKent Hansen2012-02-022-30/+0
| | | | | | | | toInt() and toUInt() should be used instead. Task-number: QTBUG-23604 Change-Id: Ib64aea139e9082066a1e5096ef9fe3a97c35d3eb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Support inline images with <img> tag in StyledTextYann Bodson2012-02-0221-59/+620
| | | | | | Task-number: QTBUG-21793 Change-Id: Ie7b9f293c6c9a949c1899152c38b61251b0069d3 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Debugger Test Case: Fix failuresAurindam Jana2012-02-021-10/+11
| | | | | | | | | Fix test cases related to verifying debug messages. Task-number: QTBUG-23977 Change-Id: Ieab6a5975bff1ef7fcee3eb1befe0c544a63ea1f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Incorrect initial pos after resizing view with margins.Martin Jones2012-02-025-20/+123
| | | | | | | | | | The currentItem tracking didn't position the view to show the margins. This affects resizing the view and also changing currentIndex. Task-number: QTBUG-24028 Change-Id: I47d4c771c0d712c93abadfb6b2deb5194241fb6b Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Revert "Mark tst_qdebugmessageservice as insignificant until it passes again"Alan Alpert2012-02-021-2/+1
| | | | | | | | This reverts commit 27427efbb9c898b08de92e6b0a1b4d890fcdcabc, as it passes again. Change-Id: Ie05729c024c748ff5c4c58c143ee8601f7c466c2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* update .gitignoreCharles Yin2012-02-021-0/+2
| | | | | | Change-Id: I7bb60aaadf2ca2153e8e76bba092dba753e9cf2c Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix unhandled touch events not being ignored.Simon Hausmann2012-02-022-12/+95
| | | | | | | | | Unhandled touch events need to be ignored in order for things like mouse event synthetization in QtGui to work. Change-Id: I6fe9dad205c8bb8547d2424c2e2a3b3518598006 Reviewed-by: Andras Becsi <andras.becsi@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove QJSEngine::nullValue() functionKent Hansen2012-02-024-41/+21
| | | | | | | | | | | | | | | Rationale: It's strange to have a null value factory function. There should just be one way of constructing null values: By passing NullValue to the QJSValue constructor. The nullValue() function created a value that was bound to the engine; the QJSValue constructor does not. In order to ensure that we're testing the same behavior as before, I've replaced nullValue() calls by evaluate("null") in the autotests. Task-number: QTBUG-23604 Change-Id: Ie40b61fa64e070b90c6245fd21554963073c5f80 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Remove QJSValue constructors that take QJSEngine argumentKent Hansen2012-02-026-362/+220
| | | | | | | | | | | Rationale: These were remnants from QtScript. The difference from the standard constructors is that the value is eagerly bound to the engine, so they can be a bit faster. But they are also more low-level and look ugly in use. Task-number: QTBUG-23604 Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Remove QJSValue::propertyFlags() functionKent Hansen2012-02-0213-157/+32
| | | | | | | | | | | | | | | | Rationale: The API is incomplete. There is no way to set/update the flags; adding a third (optional) argument to setProperty() is ugly. If necessary, a QJSPropertyDescriptor API should be added, to enable complete setting/querying of properties. The flags were moved to QJSValuePrivate, and the propertyFlags() implementation kept, because there is one place the read-only flag is checked internally (in qv8typewrapper). Task-number: QTBUG-23604 Change-Id: I089dce28dbda428662aac7c8d1536987fe6d855c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Remove invalid QJSValue typeKent Hansen2012-02-0210-347/+191
| | | | | | | | | | | | | | | | | | | Rationale: It's confusing to have an invalid type (which doesn't exist in JavaScript), and it creates lots of extra cases that have to be handled e.g. in value conversion and comparison. The Undefined type should be sufficient. Also, the invalid value type was being (ab)used to 1) make setProperty() act as a property deleter, and 2) signify that a property queried by property() doesn't exist. The recently introduced functions has(Own)Property() and deleteProperty() now provide that functionality. Default-constructed QJSValues now have the Undefined type. Task-number: QTBUG-23604 Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fix include of private header used between two qtdeclarative librariesKalle Juhani Lehtonen2012-02-021-4/+4
| | | | | | | | | Installed private headers can only include installed Qt headers. It is not safe to include headers from source tree, which can be removed after installation. Change-Id: I3b90e93a9b1b77e53bfcbf0eb914394ff7e48a57 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Must update columns when GridView geometry changesBea Lam2012-02-027-17/+86
| | | | | | | | | | Regression from changes in 80d85e0017cb5cc4b0a0df6c19d4126bf5062731 Also remove shared duplicate code in visibleItemsChanged() in ListView and GridView. Change-Id: Ic3ab3ba070ddf9901a232ed5b3250c725797cf69 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Multiple fast flicks with large content moves fasterMartin Jones2012-02-024-19/+94
| | | | | | | | | Repeatedly flicking quickly in a large view moves faster than the velocity of the touch. Task-number: QTBUG-18600 Change-Id: Ie6747e0d945022e0c0c5f6c5f95bc35403a14d56 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* More StyledText autotestsYann Bodson2012-02-021-0/+2
| | | | | Change-Id: I4fab5f0b421ddccce2c4bce58861ec236f3434f9 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Compress consective StyledText whitespaces into a single space.Andrew den Exter2012-02-022-17/+64
| | | | | | | | | This improves the correctness of the parser and prevents line feed characters appearing as unrendereable characters. Change-Id: I54e8be011ba4d9ad65ee2142e6b1f423a7579352 Reviewed-by: Yann Bodson <yann.bodson@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Clear Text formatting when setting plain text content.Andrew den Exter2012-02-021-0/+1
| | | | | | Task-number: QTBUG-21919 Change-Id: I55605d2bd053968868a885e63cc4bc042ada0839 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Add a persistentSelection property to TextInput.Andrew den Exter2012-02-0210-19/+136
| | | | | | | | Improves feature parity with TextEdit. Task-number: QTBUG-16355 Change-Id: I3919c71454a4f4574a1ee35ad38969459beb8363 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Handle a null source item being provided to ShaderEffectMartin Jones2012-02-021-0/+2
| | | | | Change-Id: Ibb4a141349c85738f1710ecaadb8ab78a00372ae Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* QmlProfiling: don't send v8 data if not profilingChristiaan Janssen2012-02-022-4/+14
| | | | | | Change-Id: I41085ed06bcf28e9de0a72f25076b91b9a3b2aea Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Add autotests for StyledText list tags (<ol> and <ul>)Yann Bodson2012-02-021-0/+19
| | | | | | Task-number: QTBUG-23979 Change-Id: Ic050e443ceed3cc41bd156de1455b2a9bc25fb35 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>