aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Install examples to example hierarchyroot2012-06-2210-22/+22
| | | | | | | | Some examples were installing to an old path of qtdeclarative/qtquick Task-number QTBUG-26205 Change-Id: I6e1840b1f1a87e24c1728de1b7320d6738bd530e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename Flickable x/yOrigin to originX/YBea Lam2012-06-227-48/+51
| | | | | | | | This is consistent with the naming of other x/y properties, e.g. contentX/Y, relativeX/Y etc. Change-Id: I5159f8e54a6fda6a1f83a563ea9db47c3b8af238 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove properties related to highlight speedBea Lam2012-06-2210-74/+7
| | | | | | | | | | ListView should only have duration-type properties (i.e. highlightMoveDuration and highlightResizeDuration) as it's unnecessary to have both duration and speed properties for the highlight animation. (PathView and GridView only have the duration-related properties.) Change-Id: I1b94599e3e89afe6488ce2a882c2802354a859fe Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add some tests for literal parsingMartin Jones2012-06-222-0/+68
| | | | | Change-Id: I3f3047cf27b1e5d230db0ed4154bac09e6adf087 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Handle enum values of -1 correctly.Michael Brasser2012-06-229-16/+36
| | | | | | | | | | This was already handled correctly most places; now the remaining cases (using an enum in ListModel, and assigning an enum to an integer property) should also work correctly. Task-number: QTBUG-21679 Change-Id: Ibff13f0b94da94b18e2e3bae4aa6ba44e0fa944b Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Clarify anchor error messages.Michael Brasser2012-06-222-6/+6
| | | | | | Task-number: QTBUG-24625 Change-Id: Icff9fe16f053f7e79039ef31bb56cae00cdf49d1 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Add tests for clicking and dragging with right and middle buttons.Andrew den Exter2012-06-224-21/+222
| | | | | | Task-number: QTBUG-24461 Change-Id: I2c8b3455cb3aead5df7dfd85f65eb633a552b881 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't shadow member variable with argument.Andrew den Exter2012-06-222-3/+3
| | | | | | | | | Function argument is being written to itself rather than the member variable preventing the property from ever changing. Task-number: QTBUG-26158 Change-Id: Id204a193300c62feeb007a2ea9df89cba5e1d513 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix crash when selecting transformed text.Andrew den Exter2012-06-221-7/+9
| | | | | | | | | QSGClipNode cannot be used directly, a sub-class or external provider of geometry is required. Task-number: QTBUG-26234 Change-Id: I0354ec17b619886b95f7994ad5af5c96e97397a0 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* dynamiclist example used different delegate height for anim and staticMartin Jones2012-06-221-2/+2
| | | | | | | | | so delegates added later weren't the same size as the original items. Set a better value for both. Task-number: QTBUG-26206 Change-Id: Ic9d32528eb43a77e23e3a619834da098f177b5d6 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix snake demo.Martin Jones2012-06-221-2/+1
| | | | | | | | A surrounding Item {} appeared for no clear reason. Task-number: QTBUG-26198 Change-Id: I1ddb7cc92c5ba977d85d3047c405a90cfe697a13 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix locale test on Linux and skip it on Windows.Glenn Watson2012-06-222-7/+38
| | | | | | | | | | | The timezone that V8 internally uses was not being updated at the end of one test, causing failures in subsequent tests. This was only showing up on Windows because the test was being skipped on Linux due to a typo. Skip the test on Windows due to complexity of changing the timezone (added comments in code with details). Change-Id: I47c8542111e8ddfbdeff39815c50d98570b0c6c2 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Support enum return types in Q_INVOKABLE functions.Matthew Vogt2012-06-226-5/+99
| | | | | | | | | Handle enums correctly when used as the return type of a Q_INVOKABLE function. Task-number: QTBUG-23543 Change-Id: I14a506ffee08f5ba6aa0fdf27d6104a3ae5c48b3 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Report clashing qmldir entries for components and scriptsMatthew Vogt2012-06-228-7/+55
| | | | | | | | | | If a qmldir contains multiple lines that install the same versioned property for a single component name or script qualifier, report an error rather than silently suppress one entry. Task-number: QTBUG-25834 Change-Id: I25d3a24102a5a4fa3d82f1d31d7e52505026fff7 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Create new documentation structureChris Adams2012-06-21184-6779/+7453
| | | | | | | | | | | | | | | | | | | | The documentation currently has no clear separation between Qt QML and Qt Quick. With recent commits like: 6c8378eaf1edbbefe6aaa3672b0127816a004fd7 and ab1e510121c8a679fdaca12ccd30e0f7ac12a26b the separation between the language definition and implementation, provided by Qt QML, and the standard library for the QML language, provided by Qt Quick, is clear. This commit creates a new documentation structure that is more navigable and separates concepts into logical categories, with clear separation between QtQML and QtQuick. It also provides a more generic QML Application Developer Resources page which contains links to information for QML application developers. Change-Id: Ia807ccfbfd24ffa0e1c7f0a51ed9d2ed3aa6a733 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Put basic language types into QtQml importChris Adams2012-06-2116-26/+147
| | | | | | | | | | This import is automatically registered by the engine. It provides basic language types (Component and QtObject). Note that the QtQuick import still has these types registered into it, so this commit doesn't break existing code. Change-Id: I8ff190f057fc92969020cf8e896da1649ca3069b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix crash in QQuickPixmapData::release()Chris Adams2012-06-211-0/+4
| | | | | | | | | | | | | | | | | Previously, if the reader was deleted (eg, via engine destruction) the reply might be deleted without letting the associated QQuickPixmapData know about it. If that data was later released, it would attempt to write to previously freed memory. This commit ensures that the data's reply ptr is set to zero when the reply is deleted by the reader dtor. It also adds a comment to the reply dtor to explain why it is important. A unit test for this issue already exists: tst_qquickpixmapcache::lockingCrash() run under valgrind. Change-Id: Icd94528e1336db1c00b118b3f6d1222eef402c46 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Disallow signal-handler-specification for non-signal methodsChris Adams2012-06-215-2/+15
| | | | | | | | | | | | | | Previously, the code which checked whether a signal handler specification was valid was incorrect, in that it only checked that a method of the appropriate name existed (rather than specifically a signal method). This commit ensures that the appropriate code is updated to check the method for signal-ness. Task-number: QTBUG-26223 Change-Id: I306f6622aaa710d86c01d5bbc5146eecce7cf2c3 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Enable literal Qt enum assignment to enum properties.Michael Brasser2012-06-214-9/+50
| | | | | | | | Assigning Qt global enums to enum properties was previously handled as a binding, rather than a literal assignment. Change-Id: If6bb65f63b34f4e10c0636221ddadb11f7025735 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix warnings in declarative tests.Friedemann Kleint2012-06-207-18/+22
| | | | | | | | | | | | - Unused variables and test data. - () around operator &&. - Conversion of false to 0-pointer where QVariant was intended. - Missing enumeration value. - Remove duplicated qqmlecmascript entry from qml.pro (has an internal check for no-widgets). Change-Id: Ie030167e22bce26e3988a4406c630fb460f61a3c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* QtQuick: Fix warnings about deprecated QWeakPointer usage.Friedemann Kleint2012-06-202-4/+5
| | | | | | | Use QPointer for QObject-derived classes. Change-Id: Ia7be2354b8b3bbce04316185f49a80e76057a18b Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Mark tst_qquicklistview insignificant for Mac.Friedemann Kleint2012-06-201-0/+1
| | | | | | | Task-number: QTBUG-26244 Change-Id: I314fa5293ffaa72dafa843d1a950d0abed5a4516 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Cleanup SG properly in QQuickCanvasAlan Alpert2012-06-201-0/+2
| | | | | | | | | | The scenegraph renderer and root node were not cleaned up when all other SG nodes are. This leads to a possible case where the SG nodes regenerate for the canvas without being properly linked to the renderer. Task-number: QTBUG-23571 Change-Id: I19084af998cb7482bfddc87770ee9b5e0aad3a6c Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix binding errors in cppextensions examples.Andrew den Exter2012-06-205-1/+6
| | | | | | | | | Import QtQuick 2.0 for value type support in the examples which use QColor. Task-number: QTBUG-26207 Change-Id: I1a477f7b9ff90862d64e2d5545171728c6f97aaa Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Give the example Loader in the shared launcher focus.Andrew den Exter2012-06-201-4/+9
| | | | | | | | Allows an example to receive focus the same as if it were the root item in a scene. Change-Id: Iedd31236db50ba985aebe3bd82a5af8803dc0f17 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix missing content in installed calculator demo.Andrew den Exter2012-06-201-1/+1
| | | | | | | | Add the content directory to the project installs. Task-number: QTBUG-26203 Change-Id: I08b79534f522024b289724ebaba206715b8bfbea Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Resolve example qml file paths relative to the executable path.Andrew den Exter2012-06-201-1/+1
| | | | | | Task-number: QTBUG-26202 Change-Id: I0ef9d2aa2248c8ddfd61afcd8bca731325f8d239 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix compile of Same Game demo.Andrew den Exter2012-06-202-1/+2
| | | | | | Task-number: QTBUG-26204 Change-Id: I79059969033c57f82437bbec4e4323bfa0cc9430 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix some of the bundle test failures on Windows.Glenn Watson2012-06-202-12/+12
| | | | | | | | | | The Q_PACKED macro is not supported on Windows, so the code that serializes the bundles does not work with the loading code. Change the maximum bundle size to 4 GB so that struct packing is not required. Change-Id: Ia7c8aa856ac532732eb6e76df813f46acd66b6f2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update example in a doc.Sukhyun Kim2012-06-201-2/+3
| | | | | | | | | There are "TypeError" errors. When using ListView.view in a delegate, the id of child of delegate has to attach in front of ListView.view to access the model and its properties in this case. Change-Id: I4610f1fc8b0d085f7cba137e76e0578be7b51e23 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't start running if a frame property is setAlan Alpert2012-06-203-8/+11
| | | | | | | | | | | | This fixes an error where running couldn't be reliably set, if a frame property was also being set during initialization. With this fixed, the autotest is no longer unstable. Also fixed is a related issue where start/stop/restart were active before componentComplete. Change-Id: I34c6d872f2f146d38c65167eda8c0a97525d7f4e Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Remove hardcoded qdoc3 command from qtdeclarative_doc.priChris Adams2012-06-201-3/+15
| | | | | | | | | Previously, this called qdoc3 directly, which could fail if the system path had a pre-existing qdoc3 of a different version. Change-Id: If68e00fd60594590d40f11b08416f220f0806bfb Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* qmlscene: add --transparent argumentGirish Ramakrishnan2012-06-191-0/+14
| | | | | | | The option makes qmlscene request a format with alpha for the QQuickView. Change-Id: I6490e606dd0af534147de95783f3a2ddfa8c52c8 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Small cleanup: remove braces from single line conditionals.Robin Burchell2012-06-191-9/+5
| | | | | Change-Id: I20588ad0634aebec8374a570179ee43dd1b1dd3b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Align windowShown flag with qml renderer stateCharles Yin2012-06-142-4/+24
| | | | | | | | | | Previously, we set windowShown to true once the window is active, this is not enough for some tests as the initial rendering may not be finished yet and will give the wrong result for some tests which require reading back pixels. Change-Id: Idd67329d207aaf1734a795b40a5bcc40093cf6b8 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* QtQuick: Fix warnings about unused variables.Friedemann Kleint2012-06-133-5/+0
| | | | | Change-Id: Ibe134810cc67e30a61b42ffa3be73f59c2ef96a2 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Update Flickable velocity/overbound for each axis independentlyMartin Jones2012-06-137-78/+66
| | | | | | | | | We were attempting to update velocities/overbound correction for both axes even if only one of them had changed, leading to inaccurate values for one of the axes. Also removes a bunch of code duplication. Change-Id: I6a50b908992c976889373f541bdd1abad462e247 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Set a non-zero default cacheBuffer.Martin Jones2012-06-1333-6/+52
| | | | | | | | | | The likelihood of constant framerate when flicking is considerably improved by having a cacheBuffer. Since there is only a minimal cost in having a modest cacheBuffer, it is better to have a more optimal default value - 320 seems a good starting point. Change-Id: Id3c8a153821573b5b08c6fbd80d34152908d358d Reviewed-by: Bea Lam <bea.lam@nokia.com>
* tst_qquicklistview: further increase test timeoutKent Hansen2012-06-131-2/+1
| | | | | | | | | This test has timed out on a recent test run, but appeared to be making progress. Increase the timeout, and remove the insignificant_test flag. Change-Id: Ic3d5f0dbf43e5d0a284ae87c9fd21552b759cbad Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add a version 2 import for FolderListModelAlan Alpert2012-06-121-0/+1
| | | | | | | | | | | An interim measure to allow FolderListModel using examples to adapt. Longer term, version 1 will from be the QtQuick 1.0 module and version 2 will be from the QtQuick 2.0 module. This is implemented in change Ic378b0b9f715422a2b2f4c1037adf3a07ced7c0f. Task-number: QTBUG-25191 Change-Id: Ic378b0b9f715422a2b2f4c1037adf3a07ced7c0e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove non-templated qobject module api registration functionChris Adams2012-06-128-66/+11
| | | | | | | | | | | | | Previously, both templated and non-templated qobject module api registration functions were provided as public API. The non-templated version is identical to the templated version, except that bindings which access properties of module apis registered with that function cannot be optimized with v4. This commit removes the non-templated version of the function. Change-Id: Ic417aa241f1172bf6d055bdc7f528d7e9304097b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add pixel comparation support to qmltestCharles Yin2012-06-125-0/+172
| | | | | Change-Id: Icdee3fab497cc46260bbb9af89f4402fdc027fef Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Allow setting horizontal and vertical tile modes in sci filesYann Bodson2012-06-126-5/+66
| | | | | | | | | It was still using the old 'tileRule' name. Also make sci file parser less strict with h/v tile mode values. Task-number: QTBUG-26022 Change-Id: I41b7571b42a0fb9bd2cfab8ce2e76e57addabefd Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Emit itemChanged when Loader fails to load a source.Alan Alpert2012-06-122-1/+2
| | | | | | | | | | | | As per the source comment, it is not actually tracked whether item was null before. This is consistent with the behaviour in loadFromSource, where setting a source to null always emits item changed. This is reasonable behaviour, because it only occurs in unexpected error states where the program logic likely expects a changed signal anyways. Change-Id: I160ab04dc1b5c578ee508f4adbca65e8da5b16be Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix view delegate parent binding regression.Martin Jones2012-06-124-1/+63
| | | | | | | | | | | | 762b4d90110465aeceb96f44cd06dcda229dfe89 introduced a regression by setting the item parent after completion. This was to avoid rendering an incubated object before completion. However this breaks bindings. Restore setting the item parent before completion, and ensure items are not rendered until completed. Change-Id: Ifc9d0c34ee62e687889c32ffab7c091b4c8cc470 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Check for null ptr in qmlobject_cast definitionChris Adams2012-06-122-1/+21
| | | | | | | | | Previously, the input object wasn't checked for nullness, and thus the qmlobject_cast could assert. Change-Id: I3552150953cef8411a860a381e28b1d681494b08 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Remove qtbase pinKent Hansen2012-06-121-1/+1
| | | | | Change-Id: I0fa3fb45aa26fe4eca15fa0bcb1f67c99925a21e Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Adapt to connection-related changes in qtbaseKent Hansen2012-06-1217-63/+184
| | | | | | | | | | | | | | | | | | | The QQmlData hooks signalEmitted() and receivers() now receive the index in the signal index range (i.e., excluding non-signal methods). This was done to avoid Q(Meta)Object having to compute the class's method offset; the signal offset should be sufficient for everyone. This required adapting QQmlNotifier, QQmlBoundSignal, QQmlPropertyCache and friends to use the signal index range whenever a property's notify signal is involved in the internal connection lists and property captures. Using the signal index range also reduces the memory used for NotifyList::notifies, since useless entries for non-signal methods will no longer be created. Change-Id: I62872fbea5a1f829b8b03bae3fc1e6acd84cf886 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Mark qquickanimatedsprite autotest as insignificantKent Hansen2012-06-121-0/+1
| | | | | | | Failed twice on macx-clang developer-build OSX 10.7 only. Change-Id: If6b4aa6b88c5db8eaa04dd241bc0b43808b3983a Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Mark qquicklistview autotest as insignificantKent Hansen2012-06-121-0/+1
| | | | | | | Flaky on macx-clang developer-build OSX 10.7. Change-Id: I4e8b7604dff9dd64efd6110e2cbde461d82b94d3 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 09:52:44 +0000