aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-192-4/+2
| | | | | | | | | | 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-191-1/+10
| | | | | | | | | | | | | 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-192-21/+21
| | | | | | | | | | 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>
* PathAnimation updates.Michael Brasser2011-09-196-40/+200
| | | | | | | | | | 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>
* 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>
* 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>
* 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>
* Add Age exampleAlan Alpert2011-09-162-5/+51
| | | | | | | | | | 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>
* rename threadRendering to renderInThreadCharles Yin2011-09-162-22/+32
| | | | | | Change-Id: I21d2492288adc84d3ef99633752e78a3ea232a4a Reviewed-on: http://codereview.qt-project.org/5042 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* update canvas item documentationsCharles Yin2011-09-163-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-163-137/+82
| | | | | | | 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>
* 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>
* Documentation AugmentationAlan Alpert2011-09-161-2/+4
| | | | | | | 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-162-0/+82
| | | | | | 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-162-18/+42
| | | | | | | | | | | | | | | 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>
* Use QWindow's surface format for QSGCanvas' GL contextGunnar Sletta2011-09-151-0/+1
| | | | | | | Change-Id: Ibca3b126405e2c7a0deaad55151c1bd2b284cf93 Reviewed-on: http://codereview.qt-project.org/4972 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix pre-edit text in in QSGTextEditEskil Abrahamsen Blomfeldt2011-09-152-89/+178
| | | | | | | | | | | | We need to include the preedit text when getting the glyphs for the fragment, and we need to support background formats. Note: This assumes that the pre-edit text will not span several fragments, which seems like a reasonable assumption. Task-number: QTBUG-21261 Change-Id: I7dd28f1221f931893ba1c51cc9e8b9771b2e46c3 Reviewed-on: http://codereview.qt-project.org/4906 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Separate declarative builtin functions from QV8Engine classJędrzej Nowacki2011-09-155-985/+1115
| | | | | | | | | | | | Function like md5(), darker(), createQmlObject()... should not belong to QV8Engine class This is an attempt to balance size of source files. Change-Id: If36405ad5359e11e992bb4f17764be6c18e94a6a Reviewed-on: http://codereview.qt-project.org/4351 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove some unused includes.Jędrzej Nowacki2011-09-158-11/+1
| | | | | | | Change-Id: I5090b0d3c88f3c972b1f1d2a56a954138f8d02ca Reviewed-on: http://codereview.qt-project.org/4283 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Split qjsconverter_p header.Jędrzej Nowacki2011-09-155-191/+282
| | | | | | | Change-Id: I7495cfe5932cdd226e6e8c550fff421e3705184a Reviewed-on: http://codereview.qt-project.org/4411 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Remove dead code.Jędrzej Nowacki2011-09-151-15/+0
| | | | | | | | | | Last time when I checked using ExternalStringResources was slower then normal strings. Probably in future we may reevaluate this idea. Change-Id: I9e8d971be146a29256d4e01e4fae6e50cfe42c80 Reviewed-on: http://codereview.qt-project.org/4245 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix potential memory corruption.Jędrzej Nowacki2011-09-151-1/+17
| | | | | | | | | | | | | The code exploited information that most of types in union use d pointers and that size of d pointer is less or equals then sizeof(QVariant) or sizeof(double). Still the code may suffer from an alignment issue on some exotic platforms. Change-Id: I4ef331f4cdb7177337ddcc8696f78d85e9594d27 Reviewed-on: http://codereview.qt-project.org/4244 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Cleanup includes in QDeclarativeData.Jędrzej Nowacki2011-09-151-1/+1
| | | | | | | | | QJSValue is not used in QDeclarativeData class, but QHash is. Change-Id: Iae5cd7ed39ade04cb16afb4521978d527e97d878 Reviewed-on: http://codereview.qt-project.org/4242 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* We need to set the OpenGLSurface surface type on QSGCanvas.Samuel Rødal2011-09-151-0/+2
| | | | | | | Change-Id: Ib0ea343399b703c3437603918d97fc925e2adc4c Reviewed-on: http://codereview.qt-project.org/4908 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Remove unnecessary updateInputContext function from QSGCanvasPrivateJoona Petrell2011-09-152-12/+0
| | | | | | | Change-Id: Ibc64ef8a90854edf2c4b341ba01afdac19a813e1 Reviewed-on: http://codereview.qt-project.org/4742 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Pass Qt::ImQueryInput instead of Qt::CursorRectangle in ↵Joona Petrell2011-09-151-1/+1
| | | | | | | | | | | | | | QSgItem::updateMicroFocus function QPlatformInputContext::update() function takes QInputMethodQueries flag as a parameter. When cursor rectangle changes many input method query attributes like cursor rectangle, cursor position, surrounding text, current selection and a position change as well. New composite query ImQueryInput encapsulates this. Change-Id: I83b17507f22fcbec0d8ed50588c67794d62f9495 Reviewed-on: http://codereview.qt-project.org/4741 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed compile on mac (workaround for build system bug)Rohan McGovern2011-09-151-0/+13
| | | | | | | | | | | | | | | | | When using QT += somemodule, and using frameworks on mac, qmake refuses to add `-framework somemodule' to the compiler flags unless the framework can be found on disk. This can easily break when compiling two frameworks out of the same source tree. In this case, if QtQuick1 were qmake'd prior to QtDeclarative being built (which is expected for a clean build), it would incorrectly put -lQtDeclarative into the link line even if QtDeclarative should be built as a framework. The problem would disappear if qmake was re-run. Change-Id: I79cbfc454e0ab564ce6597b4f7e613c1ff39473f Reviewed-on: http://codereview.qt-project.org/4938 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fixed failing test in QSGFocusScope.Matthew Cattell2011-09-141-1/+4
| | | | | | added some waits and removed unnecessary lines from autotest Change-Id: I847bde6db5222b12d0f0b88a8c323fd09aad9d7c
* fix declarative to work after broken refactorGunnar Sletta2011-09-137-45/+62
| | | | Change-Id: I5a30f8c45e21344060ea6e61d440d6fea822f9de
* Merge branch 'refactor'Gunnar Sletta2011-09-13186-1723/+2329
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/context2d/qsgcanvasitem.cpp src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/context2d/qsgcontext2d_p_p.h src/declarative/particles/qsgcustomparticle.cpp src/declarative/particles/qsgparticlesystem.cpp Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
| * Fix QtDeclarative refactor branch clean compilationJoona Petrell2011-09-121-1/+1
| | | | | | | | | | | | | | Change-Id: I6a5d6cc4de7a7b50cbf49a535cd764cb07ce3c40 Reviewed-on: http://codereview.qt-project.org/4684 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
| * changed include to use newly public qsgvertexcolormaterial headerMatthew Cattell2011-09-122-2/+2
| | | | | | | | | | | | | | Change-Id: I701b573b6c93d6e69ea6f8fc16b5913162bf9ace Reviewed-on: http://codereview.qt-project.org/4680 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Implement QSGVertexColorMaterial::compare and make the class publicGunnar Sletta2011-09-123-10/+10
| | | | | | | | | | | | | | | | | | | | Since the opaque state is just as easily settable through the Blending flag, we ditch it Change-Id: I92598e3305bd056fdf0711f1fbd6c1be8bf88275 Reviewed-on: http://codereview.qt-project.org/4628 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * orient the fbo rendering the same way as other fbo rendering and enable ↵Gunnar Sletta2011-09-121-3/+6
| | | | | | | | | | | | | | | | | | multisampling Change-Id: Ibfb3bd9577efc50ca7654019638d22b9077df6bb Reviewed-on: http://codereview.qt-project.org/4627 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
| * Merge branch 'master' into refactorGunnar Sletta2011-09-12141-2928/+6120
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * | Make QSGItem::update() work when called from inside ↵Paul Olav Tvete2011-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSGCanvasPlainRenderLoop::paint() If update was called in a function triggered by rendering, it would set the dirty flag without posting an update event. Subsequent render calls would just return without doing anything because the dirty flag was set. This could cause the applications UI to freeze up. Change-Id: Ib50403c1d9e22cc4680379f0c90fb2fcaa29c1d6 Reviewed-on: http://codereview.qt-project.org/4550 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | make quicktest build and modify to use qwindowMatthew Cattell2011-09-094-36/+37
| | | | | | | | | | | | | | | | | | Change-Id: Idebb00b828307421bcbd89d8abaa9ea1d903af47 Reviewed-on: http://codereview.qt-project.org/4542 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Only polish once pr frameGunnar Sletta2011-09-091-2/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: I7295d0936dd220c092ed6c78b19fdf8ee3a3ce23 Reviewed-on: http://codereview.qt-project.org/4465 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 04:55:33 +0000