summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativescriptparser.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-171-1/+1
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
| * Qt.include() used in WorkerScript is broken on Windows.Martin Jones2011-03-161-1/+1
| | | | | | | | | | | | | | | | | | The script local filename was used to resolve the source URL rather than the script URL. Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce Task-number: QTBUG-17977 Reviewed-by: Aaron Kennedy
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+4
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Fix line information for dynamic slots in .qml filesKai Koehne2011-03-091-1/+4
| | | | | | | | | | | | | | | | Take whitespace before the opening bracket into account, e.g. save the newlines in function f()\n{} Task-number: QTBUG-18006 Done by Roberto Raggi
* | Fix compilation on INTEGRITYRolland Dudemaine2011-02-221-15/+15
|/ | | | | | | "Value" and "Object" are reserved words on INTEGRITY Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Fix QtDeclarative compilation warningsJoona Petrell2011-01-181-6/+0
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | Support property/method versions in QMLMartin Jones2011-01-051-1/+0
|/ | | | | | | | Use metaobject revisioning to exclude properties/revisions added in later versions from interfering with earlier versions. Task-number: QTBUG-13451 Reviewed-by: Aaron Kennedy
* Fix compile warnings.Friedemann Kleint2010-09-141-1/+1
| | | | Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
* Simplify type management codeAaron Kennedy2010-08-271-6/+0
|
* QML JavaScript .import parserAaron Kennedy2010-08-271-0/+211
|
* Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-241-1/+1
| | | | | Task-number: Reviewed-by: Aaron Kennedy
* Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-1/+1
| | | | | Reviewer: David Boddie Task number: QTBUG-11938
* Fix compilation with QT_NO_TEXTCODECTasuku Suzuki2010-07-291-0/+2
| | | | | Merge-request: 755 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compiler warningAaron Kennedy2010-07-221-2/+0
|
* Reuse QML lexer to simplify .pragma script logicAaron Kennedy2010-07-221-62/+37
|
* Small cleanupsAaron Kennedy2010-04-281-56/+19
|
* Disallow "Qt" as namespace importAaron Kennedy2010-04-271-0/+8
| | | | | | This conflicts with the global object's "Qt" property. QTBUG-10143
* Remove "property var" supportAaron Kennedy2010-04-191-6/+0
|
* Remove Script {} supportAaron Kennedy2010-04-191-73/+21
|
* unwarnWarwick Allison2010-04-091-1/+1
|
* Use variant instead of var in QMLAaron Kennedy2010-04-091-2/+9
| | | | | | In QML "var"s are not the same as JavaScript vars - they are QVariants instead. However, as they behave in a similar enough fashion to native JavaScript it can be confusing to developers when they are called "var".
* Cleanup handling of errors in bindings and scriptsAaron Kennedy2010-04-081-0/+1
| | | | | | | | | | | | | QML used to silently ignore a log of errors - such as a failed assignment to a QObject property. These errors are now all reported as exceptions in JavaScript. Other questionable activities, like assigning a JavaScript array to a "property var" property which appeared to work, thanks to QtScript's transparent conversion of arrays to a QVariantList, are now blocked entirely. QTBUG-9152 QTBUG-9382 QTBUG-9341 QTBUG-6886
* Fix location of error message.Warwick Allison2010-04-081-2/+2
|
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-021-3/+3
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Fixed: Declared properties cannot be assigned in declarationRoberto Raggi2010-03-311-5/+8
| | | | Task-number: QTBUG-7860
* Remove "variant" QML propertiesAaron Kennedy2010-03-291-2/+1
| | | | "property var a" works just as well
* Use QDateTime when specifying a "date" property in QMLAaron Kennedy2010-03-291-1/+7
| | | | QT-718
* Deprecate inline Script {} blocksAaron Kennedy2010-03-221-4/+126
| | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
* Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-5/+0
|
* Improve grouped property error messagesAaron Kennedy2010-03-041-2/+2
| | | | QT-2579
* Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-021-17/+49
| | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.
* Fixup tests after QDeclarative class renamesAaron Kennedy2010-02-241-1/+1
|
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+952
QDeclarativeXXX.