aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add install rule for qmlminKent Hansen2011-09-191-0/+2
| | | | | | | Change-Id: I7ea6e92e8fe54092bb16d92e69a83b0257a67acf Reviewed-on: http://codereview.qt-project.org/4787 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix typo when recognizing escape charactersRoberto Raggi2011-09-191-1/+1
| | | | | | | Change-Id: Id97d5c12d271794fb9c7c752fd6535af90883eb4 Reviewed-on: http://codereview.qt-project.org/4770 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix automatic insertion of semicolons.Roberto Raggi2011-09-191-7/+2
| | | | | | | | | | Use Lexer::canInsertAutomaticSemicolon() when recovering from errors generated by missing T_SEMICOLON tokens. Change-Id: Ie4011d8d3e02b02a7dccd0a09ffa28b1ec9e654d Reviewed-on: http://codereview.qt-project.org/5017 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add support for minimizing Javascript files containing pragmas.Roberto Raggi2011-09-192-25/+92
| | | | | | | Change-Id: Ib61d5ea42ec810c36ba782b558461bc09be199dc Reviewed-on: http://codereview.qt-project.org/5016 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add the method tokenKind() to the QML/JS lexer.Roberto Raggi2011-09-192-0/+6
| | | | | | | | | The method returns the last token recognized by the lexer. Change-Id: I9464e96c1276852737ddc8330d08d57326b48888 Reviewed-on: http://codereview.qt-project.org/5015 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add support for QML/JS pragma directives.Roberto Raggi2011-09-192-0/+119
| | | | | | | | | | | | | The lexer can now recognize the following pragma directives: .pragma library .import <URI> <Version> as <Identifier> .import <file.js> as <Identifier> Change-Id: I2c44140818f356419640266a46b5e172474819ee Reviewed-on: http://codereview.qt-project.org/4897 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add auto tests for the QML minifier.Roberto Raggi2011-09-193-1/+173
| | | | | | | Change-Id: Iba821eb490ea791e9c375565985af62cef91d1f3 Reviewed-on: http://codereview.qt-project.org/4671 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix automatic semicolon insertion.Roberto Raggi2011-09-196-18/+43
| | | | | | | | | | The parser should insert a T_SEMICOLON token when it reaches an error state and the lookahead token is following a closing brace. Change-Id: Ib849e7fbfe50c2a3e679ae0794f5780cc0b94de5 Reviewed-on: http://codereview.qt-project.org/4896 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix compile when the parser is included in non GUI applications.Roberto Raggi2011-09-191-1/+1
| | | | | | | Change-Id: I63d910f0f63cd88d919b5487d5b48f6019eca9bd Reviewed-on: http://codereview.qt-project.org/4895 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Added --verify-only option to qmlmin.Roberto Raggi2011-09-191-11/+17
| | | | | | | | | | | | | | | | | qmlmin has three different stages. In the first stage it generates the QML/JS minified code. In the second stage we verify that minified code is equivalent to the original code and in the final stage we produce the output. With --verify-only you can tell qmlmin to quit after the verification step. Note that this option is pretty much equivalent to the unix command qmlmin file.qml -o /dev/null. Change-Id: I91373bc1c1db8c35af2e301ad13d7b34fc384529 Reviewed-on: http://codereview.qt-project.org/4670 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Introduced qmlmin.Roberto Raggi2011-09-193-1/+529
| | | | | | | | | | qmlmin is a simple minifier for QML and Javascript files. It removes comments and layout characters. Change-Id: I387a683cd9b73e8fd225e10a75b3fcec50949938 Reviewed-on: http://codereview.qt-project.org/4442 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix the implementation of Lexer::tokenText().Roberto Raggi2011-09-192-7/+11
| | | | | | | | | | Lexer::tokenText() should return the contents of the string literal without the quotes. Change-Id: I968ca2e5142d8c55c75990c24380d2faa9b313a3 Reviewed-on: http://codereview.qt-project.org/4440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Introduced a QML scanning mode.Roberto Raggi2011-09-193-32/+35
| | | | | | | | | | In QML mode, the lexer will recognize the extra QML keywords, e.g. readonly, as, on, and so on. Change-Id: I148ff857e201f99d41e0265bcfc480a94a1085a0 Reviewed-on: http://codereview.qt-project.org/4518 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Re-enable QtQuickTest.Rohan McGovern2011-09-193-6/+3
| | | | | | | | | | This was disabled in refactor, but it seems to be working OK, so turn it back on. Change-Id: I35d97342c6ef7be358d9cb593a1eab27c711247c Reviewed-on: http://codereview.qt-project.org/4846 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Get rid of QDeclarativeUtilsKent Hansen2011-09-196-127/+31
| | | | | | | | | | | All the QChar methods needed by QtDeclarative have now been optimized to achieve at least as good performance as the QDeclarativeUtils versions. Change-Id: I5b8dd58f9b597f716b53563d07d39d894c5dd666 Reviewed-on: http://codereview.qt-project.org/5059 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix QDeclarativeListProperty assignmentChris Adams2011-09-193-1/+46
| | | | | | | | | | | | | This commit ensures that a QDeclarativeListReference can be assigned to another QDeclarativeListProperty, by retrieving each element in the list reference and converting to the appropriate type before appending to the target list property. Task-number: QTBUG-16316 Change-Id: Id8858058f052a53bf43eadc085fd278654478d77 Reviewed-on: http://codereview.qt-project.org/4388 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Make cellWidth/cellHeight reals rather than ints.Michael Brasser2011-09-194-25/+56
| | | | | | | | | | When they were ints, it was relatively easy to end up with a different row or column count than expected, because of rounding. Change-Id: Ifc5eba2b5598cbc0220df25f91f031581c3b51a5 Reviewed-on: http://codereview.qt-project.org/5112 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* QtQuick 2.0 elements system testDamian Jansen2011-09-1949-0/+4096
| | | | | | | | | | | Added an application to browse elements. A very basic acceptance test method that each can be performed in under a minute. Added the .qtt for formal usage. Also moved qsgimage system test. Change-Id: Iada9804e2efe1339a072935647962e54aa3b4c6f Reviewed-on: http://codereview.qt-project.org/4380 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* PathAnimation updates.Michael Brasser2011-09-199-62/+351
| | | | | | | | | | Allow smooth orientation changes, smooth interruptions, and implicit "from" in PathAnimation. Change-Id: I2191f6df89ec25d78b1d498827281803a07129c9 Reviewed-on: http://codereview.qt-project.org/4378 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Test fixes and reenables.Michael Brasser2011-09-183-40/+28
| | | | | | | Change-Id: I85e3493855b6fefb682ddb120b15abd003fb00fd Reviewed-on: http://codereview.qt-project.org/5045 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* JSDebugging: Enable break on events.Aurindam Jana2011-09-173-12/+100
| | | | | | | | | | | | The user can request Javascript break on event. The user can provide this info in the Breakpoints Window and provide the slot which will be called when the event occurs. For example: specify "onTriggered" if you need to break on Timer triggerred event. Change-Id: I09f869a5301a9c1f92a8b8c0f3df7f74b1027b4b Reviewed-on: http://codereview.qt-project.org/4751 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Re-enable commented tests.Jędrzej Nowacki2011-09-164-7/+7
| | | | | | | | | | The tests used QWidget class so widgets library have to be added to pro file. QDeclarativestates works fine. Change-Id: I55c0798a37c3a894b774ba71671569fe007a49d7 Reviewed-on: http://codereview.qt-project.org/5104 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Re-enable commented QJS tests.Jędrzej Nowacki2011-09-162-3/+3
| | | | | | | | | | The tests used QWidget class so widgets library have to be added to pro file. QJSValue test already had it. Change-Id: Ib93b2e9b84dea76f5121378c13cc0e1921a4ebd9 Reviewed-on: http://codereview.qt-project.org/5101 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Remove QmlChanges.txt fileAaron Kennedy2011-09-161-364/+0
| | | | | | | | | | Somehow I don't think changes prior to Qt 4.7.0 RC are that interesting anymore. Change-Id: I42d8bbb5de8ab04796b9f6f313fbb93d0a9c7794 Reviewed-on: http://codereview.qt-project.org/5055 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Get rid of autotests dependencies on QtWidgetsKent Hansen2011-09-165-10/+10
| | | | | | | Change-Id: I19936b7f8173eff9fc0bc3e19b0a61830dc5a440 Reviewed-on: http://codereview.qt-project.org/5097 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix an assertion in QDeclarativeNotifierEndpointLars Knoll2011-09-161-1/+1
| | | | | | | | | | | The code in toNotifier() tried to convert to a Notifier, and called asNotifier() before setting the type correctly. Change-Id: I2d4c41c6bf43422587111ae4e0c57a3905f159e0 Reviewed-on: http://codereview.qt-project.org/5089 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Initialize variableLars Knoll2011-09-161-1/+1
| | | | | | | Change-Id: I2aa261ed85136df33f678a9279f7f9c833c925cd Reviewed-on: http://codereview.qt-project.org/5088 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Disable autotests temporarily on MacKent Hansen2011-09-161-0/+2
| | | | | | | Change-Id: Ib34fdbdce2b088e0f79034342ab1fc9c94ea10f9 Reviewed-on: http://codereview.qt-project.org/5080 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add Age exampleAlan Alpert2011-09-163-5/+143
| | | | | | | | | | Also added advancePosition property to Age, as it was needed for even this simple example. Change-Id: I614a719280efc1bc5140d07ab91ec0f1bc345788 Reviewed-on: http://codereview.qt-project.org/4871 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix aliasing bug when compiled with gcc 4.6Aaron Kennedy2011-09-161-9/+16
| | | | | | | | Change-Id: I50dbeaed501ae498cd5c46e6e5929789b373b932 Task-number: QTBUG-21265 Reviewed-on: http://codereview.qt-project.org/4957 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Reference V4 program dataAaron Kennedy2011-09-163-5/+11
| | | | | | | Change-Id: I84d520da16def8e48ac8bbfaab654450f776abc8 Task-number: QTBUG-21265 Reviewed-on: http://codereview.qt-project.org/4956 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fill out examples a little moreAlan Alpert2011-09-162-0/+205
| | | | | | | | | | Adds an example of colorized ImageParticle, and an example comparing the particle system to dynamically created Images (which don't do too badly when they're kept really simple). Change-Id: Id9e8d0575a38ddde1c73d694bd5c062d56cbed42 Reviewed-on: http://codereview.qt-project.org/5047 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Particles examples shuffleAlan Alpert2011-09-16151-903/+1124
| | | | | | | | Recast as examples, not demos. Fewer licking face usages. Change-Id: I02a03fb9af513cbc3dc2a94aa0843220f162593b Reviewed-on: http://codereview.qt-project.org/4754 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Hotfix docsAlan Alpert2011-09-161-0/+12
| | | | | | | | | | | While QtQuick 1 and 2 aren't clearly separated yet, some of the more drastic differences (like the separate particle systems) need to be explained a little in the interim. Or at least visible. Change-Id: I60321bcb90a34730ed3e0862a049540ea36f8c5b Reviewed-on: http://codereview.qt-project.org/5044 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* rename threadRendering to renderInThreadCharles Yin2011-09-1613-45/+49
| | | | | | Change-Id: I21d2492288adc84d3ef99633752e78a3ea232a4a Reviewed-on: http://codereview.qt-project.org/5042 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Fix qsgpositioners autotestAlan Alpert2011-09-161-8/+19
| | | | | | | | | | | A waitForWindowShown now takes long enough of the animations to make progress, which had been confusing the initial state checks. Task-number: QTBUG-21414 Change-Id: I3e01f804d6bca7f627012da6cc69b0baabaabaaa Reviewed-on: http://codereview.qt-project.org/5041 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* update canvas item documentationsCharles Yin2011-09-1628-126/+569
| | | | | | Change-Id: I66cc6550a7d8eb054c70b6f17fee05976e0a32c6 Reviewed-on: http://codereview.qt-project.org/5040 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* fix context2d composition bug, lighter should map to qt ligten composite modeCharles Yin2011-09-161-3/+3
| | | | | | | Change-Id: Iacc9cb4bd9196869b9947f919b7748ab5ad9610f Reviewed-on: http://codereview.qt-project.org/5039 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* fix broken canvas blur after merging refactor branchCharles Yin2011-09-164-139/+84
| | | | | | | Change-Id: If145f1d02566f839abeb50df167db2b237499290 Reviewed-on: http://codereview.qt-project.org/4857 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Fix warnings.Michael Brasser2011-09-165-13/+11
| | | | | | | Change-Id: I7f066550fa2e1799f1c44b787da84c882f549b03 Reviewed-on: http://codereview.qt-project.org/5036 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add exception for qpa, xcb platform for failing testToby Tomkins2011-09-161-0/+3
| | | | | | | | | | Task-number: QTBUG-21416 Change-Id: I69986ea120d908d20a4ef73bf137ca0906dc4351 Reviewed-on: http://codereview.qt-project.org/4729 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update system offset every frameAlan Alpert2011-09-162-19/+8
| | | | | | | | | May be expensive if large systems animate painters, but seems safer than messing with the tranformation matrix. Change-Id: Ie5b21e9f238b5305bef44c48027a3337c70b2aaa Reviewed-on: http://codereview.qt-project.org/4933 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Friction and Gravity examplesAlan Alpert2011-09-162-0/+208
| | | | | | | Change-Id: Ie816f1209711aae3b9cd1465f874919370c26028 Reviewed-on: http://codereview.qt-project.org/4875 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Documentation AugmentationAlan Alpert2011-09-162-5/+9
| | | | | | | Change-Id: I662526a9c0f9c8694ec39aa0d5ad9286d1c9f208 Reviewed-on: http://codereview.qt-project.org/4863 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update Turbulence on noiseSource changeAlan Alpert2011-09-161-1/+2
| | | | | | | Change-Id: Ib730bcad0a345df8e4cd45aa5b8ab892d3de16f7 Reviewed-on: http://codereview.qt-project.org/4860 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove invalid ASSERTAlan Alpert2011-09-161-4/+5
| | | | | | | | | | | There is a possibility for it to have been updated already if newDatums are requested before emittersChanged is reached. This became possible when emitters stopped having strict particle emission limits. Change-Id: I45d1564f56547418127446e3138ff21deec891c3 Reviewed-on: http://codereview.qt-project.org/4753 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix missing/outdated license headers.Jason McDonald2011-09-1616-70/+552
| | | | | | Change-Id: Ib5f244a61cb65db829ee83ec9e4d5e4189319a9f Reviewed-on: http://codereview.qt-project.org/4936 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-09-166-20/+141
| | | | | | | | | | | | | | | Change 55cfbdb7c64068ae68f7baaceb8acfb96cb0c07e manually applied from Qt 4.7 Ensure the smoothed velocity is set at the start of the flick. Ensure that the smoothed velocity animation isn't restarted unless there is new valid data. Change-Id: Ia77249be9980aba268a1bfa0ea3f69c49fa09e5e Reviewed-by: Bea Lam Reviewed-on: http://codereview.qt-project.org/4712 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* When we create textureprovider, initialize it with the texture if we got itGunnar Sletta2011-09-151-5/+5
| | | | | | | Change-Id: Ia3ab1a75db947a67c610e664051f73bf84b079c1 Reviewed-on: http://codereview.qt-project.org/5008 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Support preedit text in QSGTextInputEskil Abrahamsen Blomfeldt2011-09-152-55/+74
| | | | | | | | | | | | | | We need to support merged additional formats with backgrounds in the QSGTextInput as well, so that code has been separated into its own function. We also need to account for the position in the bounding rect, so that the decorations are painted at the correct location when there text input is scrolled. Task-number: QTBUG-21261 Change-Id: I0799a62bf26e6a7a2c1a6eef9bbdf889c1c8e870 Reviewed-on: http://codereview.qt-project.org/4964 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 22:51:37 +0000