aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* These docs should use \ingroup not \groupBea Lam2012-08-027-13/+13
| | | | | | | | \group generates a page with a set of links for a group, whereas \ingroup declares that a page belongs to a group. Change-Id: I3922ea0037d20a93a2c061d9f85ee0a9a83a80df Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Update docs now that all basic types can also be property typesBea Lam2012-08-021-32/+18
| | | | | Change-Id: I9f90627dc3f83e64e6d1d7b2937fdf5653a063f3 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Skip failing testBea Lam2012-08-021-0/+4
| | | | | | | | tst_qqmlxmlhttprequest::stateChangeCallingContext() sometimes fails on Windows. Change-Id: Ib755c614e23587e6ea216da5c9108100a0f05d39 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Visual coordinates documentationAlan Alpert2012-08-022-1/+52
| | | | | | Task-number: QTBUG-26367 Change-Id: I4a782118e96aecfaf7cfa6921afcb6dd1f86d665 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Minor restructuring of application developer resourcesChris Adams2012-08-021-34/+56
| | | | | | | | | | Move the QtQml/QtQuick overviews below the quickstart / usecases sections. Merge the Important Topics and Debugging And Testing sections into a single Advanced Topics section. Modify some of the formatting used to improve the consistency of the page. Change-Id: Iab0b077130a763951a2967e725c2ef8ec2937ae8 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Add tests for writing to model role properties.Andrew den Exter2012-08-021-0/+31
| | | | | Change-Id: I91375e9caecc130fb3a86f5a48d19e000fa6fcac Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Test the VisualDataModel hasModelChildren propertyAndrew den Exter2012-08-022-1/+54
| | | | | Change-Id: I9ea71ca5c7d6a0f161cc92583c187d591d26826a Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Add tests for VisualDataModel watched roles.Andrew den Exter2012-08-022-0/+92
| | | | | Change-Id: Idc84d0f833fe2ec4ed29bbda62def17ec20a3a8b Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Fix handling of changes to the root index of a VisualDataModel.Andrew den Exter2012-08-029-92/+358
| | | | | | | | | | Store the root index as a QPersistentModelIndex so the index remains valid as the model changes, and in the case the root index is removed from the model invalidate the contents of the VisualDataModel until a new root index or model is set. Change-Id: I1cbc27f2068f99a02ff3d43373905dec7e35e900 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-01178-0/+178
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I6988c2360e9d88916311374a0c910bfc5b607439 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add includes for QWindowSystemInterfacePaul Olav Tvete2012-08-016-0/+6
| | | | | | | QWindowsystemInterface will no longer be a public class Change-Id: Ibd815d377cbd553e8c3e99e99b337a9854647001 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Document readonly property syntaxBea Lam2012-08-011-1/+28
| | | | | | | Reviewed-by: Chris Adams <christopher.adams@nokia.com> Change-Id: Ibaf68b39526824098aa67f7d1fdce6d12e3b3111 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Document qmlAttachedPropertiesObject()Bea Lam2012-08-012-1/+34
| | | | | | | | This is discussed in the documentation on writing QML extensions from C++ but is not actually documented in the list of qml* functions. Change-Id: Id24be88dc3fa6d54cc5ee29e3da1686ea2732b39 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Skip tst_qquickfolderlistmodel::changeDrive()Bea Lam2012-08-011-0/+1
| | | | | | | | Fails on Windows. Task-number: QTBUG-26728 Change-Id: I81c4b13940fe68d780db9d43a5a11edf8f12e99a Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Refactor context2d thread logicCharles Yin2012-07-3118-464/+172
| | | | | | | | | | 1. Use QQuickContext2DRenderThread for Threaded rendering 2. Make FBO target works with all render strategies 3. Remove some unnessary locks, call texture methods by invoking meta calls 4. Run existing tests with all render targets and strategies (except Cooperative) Change-Id: I0db5c91d848b86bcc1536c30d7a5804b66a817f1 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix folder list model when changing drives on Windows.Glenn Watson2012-07-312-4/+65
| | | | | | | | | | The folder list model implementation drops drive letters when changing folder on Windows. Fix this and add a Windows specific test case. Task-number: QTBUG-26620 Change-Id: If58551ba01b56343ebf44512620207e49d83ba09 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Visual hierarchy documentationAlan Alpert2012-07-315-1/+187
| | | | | | Task-number: QTBUG-26367 Change-Id: I4a782118e96aecfaf7cfa6921afcb6dd1f86d66b Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Docs - fix referenced class namesBea Lam2012-07-312-2/+2
| | | | | | | | Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Change-Id: If29505d57fbf4c111d3250daa12d5f0e706dfdc6 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Reset Styled/PlainText specific state when switching between formats.Andrew den Exter2012-07-311-0/+3
| | | | | | | | | Fixes markup being displayed when switching from a multilength string to styled text and formatting of elided text when switching from elided styled text to elided plain text. Change-Id: Id1e1834d81cb6142d92433a8bc571e05d226b7b3 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Implement strict mode for qmldir modulesMatthew Vogt2012-07-3160-17/+1142
| | | | | | | | | | | | | | | Allow a module's qmldir to contain a module directive, which when present specifies 'strict mode' import processing. In strict mode, type registrations are only permitted into the namespace identified in the qmldir file's module directive. In addition, any type registrations to that namespace originating from other modules are treated as error conditions. Task-number: QTBUG-26551 Change-Id: I081bde2d3b83d3f28524440177fb2cd1ccee34ad Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Some autotests which failed on OSX don't fail anymore; others doBea Lam2012-07-301-20/+16
| | | | | | | Seems to be better after the parallel touch/mouse propagation. Change-Id: I7336a451f18469d819a6105d58ae6dbb029a0c2c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiates.Jerome Pasion2012-07-3097-148/+288
| | | | | | | | | | -To simplify QDoc, \qmlclass is now \qmltype. -'\instantiates <C+++ class>' is for the types that are defined in C++. Change-Id: I29242d33daf7b972d8b86a356b9689638866b950 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Improve QML basic types documentationChris Adams2012-07-307-459/+531
| | | | | | | | | | | | | | | Basic types are provided either by the language (int, string, bool, real, double, date, url, var, variant) or by modules (value types). In 5.1 we would like modules to be able to provide more basic types, and thus a cleaner separation of the documentation makes sense. This patch also improves linking of the term QtQml so that a clear distinction is made between the QtQml QML module and the QtQml C++ Qt Module (the QtQml QML module links now point to the QtQml type reference page). Change-Id: Ibe3ad33e4616c5f29ea38dadc27e13938aedb9d7 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* qmlscene: fixed dependency on QtWidgetsRohan McGovern2012-07-301-1/+1
| | | | | | | | Don't unnecessarily refer to QApplication for installTranslator(); this is a static member of QCoreApplication. Change-Id: I7b0e0e30abe1f3a5c114136f1107de3fd7dbc815 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add tests for Text(*) default property values and notifiers.Andrew den Exter2012-07-303-8/+409
| | | | | Change-Id: I64bfe285ab4ddad53a4d323ca93b15ea0426ed51 Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Add tests for an object instance as model data.Andrew den Exter2012-07-301-0/+29
| | | | | Change-Id: I08137b24ff97b6c76edcf683e987228cf66d8816 Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Delete created objects in tests and fix warningsBea Lam2012-07-301-0/+15
| | | | | Change-Id: I593fc9f4506e849852e56fbc7c40a3481c601806 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Remove default parameter from protected QmlPropertyMap CT.Friedemann Kleint2012-07-302-3/+3
| | | | | | | | | Make public constructor explicit. This fixes QtLocation compilation (declarativeplaces defaulted to the protected CT). Change-Id: I8b32d7624b6ba770f6d646c227a0bfd37e501ee5 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Stabilize tst_qquickloader test caseMatthew Vogt2012-07-301-14/+22
| | | | | | | | Ensure cases are not affected by timer events of incubation controllers created in previous cases. Change-Id: Ia633ed142242d000de5f497896a685ca2f26e143 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Clarify use of enumeration type from QML codeBea Lam2012-07-271-3/+31
| | | | | Change-Id: I5aea6ec8c4daada284bc7881bbc3379e5ab61b94 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Remove unused notify signal.Andrew den Exter2012-07-272-10/+1
| | | | | | | | | With changes to how VisualDataModel attached objects are created the model property is now always populated on construction and the modelChanged signal is unnecessary. Change-Id: Id02c4115e19900a2937031ca70b7cba34ff13d3a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Pixmap loader adds images to unreferenced list when cache: falseMartin Jones2012-07-272-3/+66
| | | | | | | | | | | | | | Don't add uncached images to the unreferenced list, since they cannot be reused later as they are not in the cache. Additionally, we currently search for images in the cache, even if we set cache: false. Setting cache false should not put images in the cache and should not use images that are in the cache. Task-number: QTBUG-26676 Change-Id: Ib7eb42199ae6ae6154b696c83ad1dd959e0f208f Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update whatsnew documentation with value-type improvementsChris Adams2012-07-272-2/+53
| | | | | | | | | Value types are now supported as property types. QtQuick provides several new value types. Subproperty modification write-back semantics have been fixed for variant properties. Change-Id: Ic47a8401178e6f8bbd5037b6929d7afd5e3cffe6 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Allow access to signals and slots in QQmlPropertyMap inheritorsMatthew Vogt2012-07-275-8/+92
| | | | | | | | | | | Allow inheritors of QQmlPropertyMap to pass the static meta object information needed to support their signals and slots. If the correct pointer is not provided to the constructor, it is not accessible via the virtual metaObject() function during construction. Task-number: QTBUG-26400 Change-Id: Ide8c6d3568e4abd4c48e0aa60e6fa05a9c2a11cf Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix QML import paths in Qt resources.Aaron McCarthy2012-07-278-19/+79
| | | | | | | | | | | | | | | Allow adding qrc: urls as import paths. Store an import path of the form :/import/path as qrc:/import/path which is expected by other parts of the code. Update documentation for QQmlEngine::addImportPath() to explicitly state what types of paths are supported. Add auto tests to check that importing a module from a Qt resource works. Change-Id: If0e75c75078a608b20d7a5c4080bccf6241e97f6 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Add SnapPosition mode to positionViewAtIndex() in List/GridView.Martin Jones2012-07-278-395/+282
| | | | | | | | | | This allows the view to be positioned on a snap boundary, which is generally what is wanted when strict highlight mode s set or snapping is enabled. Task-number: QTBUG-26605 Change-Id: I6288dc8be4ff16c412b56ab449b6a9fb7b7ea889 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove obsolete Q_WS_QWS.Stephen Kelly2012-07-261-9/+2
| | | | | Change-Id: I41e1440ff64eafc8729701aea11292f12e3bbe8c Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove work-around for Q_DECLARE_METATYPE(QFileInfo) being added to QtCoreMarc Mutz2012-07-261-3/+0
| | | | | Change-Id: Ibf1f9a451164982bcd50195b210c5b59e684937e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QSKIP from snapOneItem() testBea Lam2012-07-261-5/+0
| | | | | | | | | | | | Past test failures are likely to have been caused by mouse events passing over from previous tests and causing a double click rather than a press for a flick. This should pass now as QQuickViewTestUtil::flick() now calls QTest::mouseMove() instead of sending MouseMove events to the window. Task-number: QTBUG-24338 Change-Id: I68f7f3f91d189ed3ead01c8646570c39ba86f1d4 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix resolution of cursor when items are overlapping.Andrew den Exter2012-07-269-19/+345
| | | | | | | | | | | | If MouseArea with cursorShapes are overlapping then cursor shape of the foremost item under the mouse cursor should be shown, but because the hover events are delivered to the foremost items first the opposite is occuring. This makes QQuickWindow responsible for correctly setting its own cursor instead of relying on items to work it out amongst themselves. Change-Id: Iedf144c583dfa3d1ff441e19db9601b5e171902a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Work around Q_DECLARE_METATYPE(QFileInfo) being added to QtCoreMarc Mutz2012-07-251-0/+2
| | | | | Change-Id: Ic83e5fdaa7ef289f40cbeb4633a75d93d38c0bdb Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Revise the restructured "Integrating QML and C++" docsBea Lam2012-07-2511-1650/+1874
| | | | | | | | | | | | | | | | | These docs were yet to be cleaned up following the recent doc restructure. This changes most of the the content in these sections and includes some new docs and examples. Currently all the code snippets are included inline. In a later patch, these should be moved into the snippets/ directories and be included using the \snippet command instead. Alternatively they can be moved into examples/ to replace the BirthdayParty examples which are no longer referenced in these docs as of this patch. Task-number: QTBUG-26381 Change-Id: I94e3654e61476fad11fe81042d1bbe94fc649d06 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Ensure params listed after unnamed params are available in QML.Glenn Watson2012-07-252-4/+5
| | | | | | | | | | | If a parameter in a bound signal had no name, it was excluded from the metaobject created by the bound signal expression. Change this so that unnamed parameters are still added (with an anonymous name). This means that subsequent parameters can be accessed from QML. Task-number: QTBUG-24481 Change-Id: Ia3403fb3bdc3da0c7e58baf7e891b67ed413bebd Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Add waitForRendering() function for qmltestCharles Yin2012-07-256-4/+30
| | | | | Change-Id: I6357412d84fdb4a8b6bd8603baba7d10a2bcc245 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Add tests for QQuickItem::childAt and antialiasing.Andrew den Exter2012-07-251-0/+68
| | | | | Change-Id: I5dc26eaf27c201be05147c7bab4d6f0b0c926aed Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix inconsistent playing / paused property setting and signalsDamian Jansen2012-07-254-16/+107
| | | | | | | | | | | | | | Playing should only indicate false if it has been set as such in code, or in the event of a valid image but non-movie being used. Noted the edge case in documentation. Signals were not being emitted for playing/paused in the cases where an image was not loaded. Paused property was also being incorrectly assigned, which supressed pause behavior. Task-number: QTBUG-26478 Change-Id: I1aaab9b7c495811114b30b491a900804a75d590f Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Empty JSON files are not needed for the plugin systemAlan Alpert2012-07-2533-34/+20
| | | | | Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove QListModelInterface.Andrew den Exter2012-07-2529-974/+426
| | | | | | | | | | Implement ListModel and XmlListModel using QAbstractListModel instead. Task-number: QTBUG-15728 Change-Id: I14e03d90883d341f4b1d89c1e9fc9dc1534fde78 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Adding mediump precision qualifier in distance-field fragment shaderThomas Senyk2012-07-241-1/+1
| | | | | | | | | sampler2D texture had no precision qualifier. This was intepreted as lowp on trim slice, leading to a glsl-compile-error because of mismatching types. Change-Id: I0a6726f6cde15c7d81f891ec75caed702f273021 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QtQuick: Remove usages of qWaitForWindowShown(QWindow *).Friedemann Kleint2012-07-2414-25/+25
| | | | | Change-Id: I722e20b2fb8d8c6c19c6f3f2cb16910d7433e9a4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>