summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/data
Commit message (Collapse)AuthorAgeFilesLines
* tests: tst_qdeclarativelanguage: fix filesystem case sensitivityShawn Rutledge2014-10-221-0/+2
| | | | | | | | | | | | | | importIncorrectCase() and errors(incorrectCase) give different error messages depending on the case sensitivity of the file system on OS X. Those are in turn different than error messages on other operating systems with case-sensitive filesystems. This patch is very similar to the one that was done in qtdeclarative: 2ebf4ba4710a01a038d05cfea741e5538bb4567f for QTBUG-37622 Change-Id: Ib13d717712cf88b476ca7edd8aababd7f5456c50 Task-number: QTBUG-41961 Reviewed-by: Liang Qi <liang.qi@digia.com>
* whitespace fixesOswald Buddenhagen2014-02-2015-18/+18
| | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix regression from Qt 4 for deep group propertiesSimon Hausmann2013-07-172-0/+11
| | | | | | | | | | | | | | | | | Setting a property like someObject.font.family would cause an out-of-bounds assertion in QList, called from QQmlCompiler::genValueTypeProperty. This appears to be a regression from commit 5e970b84663f5398eb51d4575856d1a3c44df953, which replaced one -1 to QMetaType::QVariant too many times. It appears the use of -1 is rather deliberate here and not to indicate the use of a QVariant property. The attached test verifies this as well as the successful setting of the property at the end. Task-number: QTBUG-31576 Change-Id: I237ea08847e1db31481a311ea8ec23a5ccc702d8 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Merge branch 'stable' into devFrederik Gladhorn2013-01-1711-3/+3
|\ | | | | | | | | | | | | | | Conflicts: sync.profile tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
| * Remove 'com.nokia' string from autotestAlan Alpert2012-12-0510-2/+2
| | | | | | | | | | Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5f Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Add a method that allows registration of files to typesAlan Alpert2012-12-052-0/+9
| | | | | | | | | | | | | | | | | | | | There is currently no way in C++ to duplicate the functionality of a qmldir file in mapping QML files to versioned types in a module. This functionality would be useful both in cases where a separate qmldir file would be overkill, and for cases where the type mapping should be generated dynamically. Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288eab Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | Delay loading implicit importAlan Alpert2012-12-052-0/+9
|/ | | | | | | | | | | As a performance improvement to avoid accessing the filesystem unecessarily, only import "." implicitly if types cannot be found in the existing imports. This is not a behavior change for type resolution, because "." already has the lowest precedence for type resolution. Change-Id: I8a8f10f7a790e6a02fc2c07c443f7be1984fc979 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Accept missing semicolon after do-while statement.Erik Verbruggen2012-11-261-0/+11
| | | | | | | | | | | Although not valid according to ECMA 5.1, both JSC and V8 accept a missing semicolon after a do-while loop. (Both JSC and V8 do not do this through automatic semicolon insertion, but handle it as a special case.) This is a "port" of a similair change done in the qtdeclarative module. Change-Id: I417cf18abb75e7040c48894b8f8f68afc41547fe Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-30428-0/+1919
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6