aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-05-193-6/+3
|\ | | | | | | into qtquick2
| * Update unit test according to intended behaviour change.Kim Motoyoshi Kalland2011-05-191-1/+1
| | | | | | | | | | The behaviour was changed in commit 9d7eb51da37e8dffbe284fc564c9b9f08a89bea2.
| * Re-apply "Support mirroring the source rectangle of ShaderEffectSource."Kim Motoyoshi Kalland2011-05-192-5/+2
| | | | | | | | This reverts commit 616c7e768f3d88f6b8be6af72290769e99500e72.
* | Add BurstEmitter, and a simple render path for UltraParticlesAlan Alpert2011-05-1910-64/+536
| | | | | | | | | | None of the intermediate paths are written though. It's all or virtually nothing.
* | Normalize createQmlObject error messageAlan Alpert2011-05-192-5/+5
|/
* Fix unstable test.Martin Jones2011-05-191-2/+1
| | | | Change-Id: I336b6a02b763c3be9b01a074f641cb031cf18268
* Link item focus to canvas widget focus.Martin Jones2011-05-197-65/+309
| | | | Change-Id: I7da1db30819c80b48f4c285a43274b668c686826
* Remove QEXPECT_FAIL from QSGTextInput test.Andrew den Exter2011-05-191-1/+0
| | | | | | The QSGPaintedItem::setContentSize() function has now been implemented. Change-Id: I620824073143de5e50c8ce2e4f886dc60dd79e64
* Fixed crash when Image/ShaderEffectSource source is missing.Kim Motoyoshi Kalland2011-05-182-5/+13
|
* Added documentation for GridMesh.Kim Motoyoshi Kalland2011-05-182-1/+52
|
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-05-1833-201/+462
|\ | | | | | | into qtquick2
| * Fix test TextEdit preeditMicroFocus test failure.Andrew den Exter2011-05-181-1/+7
| | | | | | | | | | Port change from QDeclarativeTextEdit test which removed a check for an update when the cursor position had not changed.
| * Skip mirror autotests while QTBUG-19351 and QTBUG-19252 are not resolved.Yann Bodson2011-05-183-5/+4
| |
| * Make SG Text test work by disabling pixmap comparison.Martin Jones2011-05-181-0/+2
| | | | | | | | This won't work with scenegraph. Manual test needed.
| * More autotests fixes.Yann Bodson2011-05-182-27/+17
| |
| * show initial chart in motion chart exampleCharles Yin2011-05-181-2/+7
| | | | | | | | Change-Id: I39297ced1c532f633a7c9c6c64c0818bbc852084
| * fix motion chart example bugCharles Yin2011-05-181-15/+68
| | | | | | | | Change-Id: I0d00d224d815210c8ef45f2289e9ec4d0adea6b5
| * Fix QSGBorderImage autotest.Yann Bodson2011-05-181-10/+10
| | | | | | | | QtQuick 1.0 -> QtQuick 2.0
| * Revert "Support mirroring the source rectangle of ShaderEffectSource."Chris Adams2011-05-182-2/+5
| | | | | | | | | | | | This reverts commit 155faa3b8b1e04241bd53df3eb008d54a71cc667. The original commit broke behavior enforced by the tst_qdeclarativeqt unit test, specifically relating to QRectF.
| * add motion chart canvas exampleCharles Yin2011-05-181-0/+82
| | | | | | | | Change-Id: Iccce2c4fc2bdeb4289093fa9675440eff589ae41
| * Reduce usage of Q_ASSERT in autotests.Jason McDonald2011-05-184-26/+28
| | | | | | | | | | | | | | | | | | | | Using Q_ASSERT does nothing in release-mode builds, and in debug builds it causes tests to terminate prematurely. It is much better to use QVERIFY or QCOMPARE. Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 3475168550c1a804f04f2a4edfeb30c04cd36551)
| * Remove Q_ASSERT from qdeclarativexmllistmodel testJason McDonald2011-05-181-1/+4
| | | | | | | | | | | | | | | | | | | | Report a meaningful warning in all builds rather than aborting in debug builds and doing nothing in release builds. Change-Id: I14aa7bc8699f5307e1ec34b18006b9fbbd8aca8e Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 1ea84cba1f90a9c95c54480117342dba0eae3d2f)
| * Remove Q_ASSERT's from ecmascript test.Jason McDonald2011-05-181-4/+0
| | | | | | | | | | | | | | | | | | | | These Q_ASSERT's were redundant as the test functions that call these functions already verify that "value == 0". Change-Id: Ic23e539c5814153d67fea8156ade0783f91d7b83 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 6f791f8ad0b7ef023d91c1609ce076443f335c13)
| * Remove Q_ASSERT from QDeclarativeListModel autotest.Jason McDonald2011-05-181-1/+4
| | | | | | | | | | | | | | Change-Id: Ic15b747fa50bcec54df748b173b299058f69c681 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 59a6e6200984ccbb862b8758436a5e88b8c40bbc)
| * Remove redundant Q_ASSERT from qmlvisual autotest.Jason McDonald2011-05-181-2/+0
| | | | | | | | | | | | | | Change-Id: I5c413793ee6322b5be1ae52658362803dc4c2010 Task-number: QTBUG-17582 Reviewed-by: Alan Alpert (cherry picked from commit d6bd4db2db6dbefec327e226bf54a69a20690a45)
| * Remove Q_ASSERT calls that wrap side-effecting code.Jason McDonald2011-05-181-3/+9
| | | | | | | | | | | | | | | | | | | | In release mode builds, code inside Q_ASSERT macros is not executed, so putting code with side-effects inside Q_ASSERT is not a good idea. Task-number: QTBUG-17582 Change-Id: I1a5d8ccce666ee7b7f120bf9cbb49e30dac9add4 Reviewed-by: Rohan McGovern (cherry picked from commit 1750a4351a8125756bf38a53d6d8312993c7d85e)
| * Add autotests to .pro fileYann Bodson2011-05-171-0/+2
| |
| * Make QSGImage autotests compile.Yann Bodson2011-05-177-123/+68
| |
| * skip unit tests if no required OpenGL 2.0 feature on this platformCharles Yin2011-05-1712-1/+167
| | | | | | | | Change-Id: I68feb5938339f327b45cf66b7aec1c582753f18d
* | Add UltraParticleAlan Alpert2011-05-1815-4/+2215
|/ | | | | They're not as cool as they sound. Includes example, and the now pointless SuperParticle (for possible performance comparisions).
* Fix emitter burst method bugsAlan Alpert2011-05-175-130/+139
| | | | | | Burst will now always burst at the x,y where it was called, and doesn't leave trails between close bursts. Kill affector also gets a fix for double killing things sometimes.
* Apply 2081a3d0fd7266ffba83849fee967e048e991270 to SG TextInputMartin Jones2011-05-172-2/+1
|
* Added documentation for ShaderEffectItem.Kim Motoyoshi Kalland2011-05-163-1/+141
| | | | Also removed unused signal.
* Added documentation for ShaderEffectSource.Kim Motoyoshi Kalland2011-05-162-0/+184
|
* Compile without qt3supportYann Bodson2011-05-161-1/+1
|
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-05-164-36/+28
|\ | | | | | | into qtquick2
| * Fix QSGBorderImage and QSGAnimatedImage autotestsYann Bodson2011-05-163-36/+25
| |
| * DocAaron Kennedy2011-05-161-0/+3
| | | | | | | | | | | | Change-Id: I25f1885ef285fb3bd14c1f499b9f42e38bba5ec6 Task-number: QTBUG-19265 (cherry picked from commit 01a374fe8a6ac0b6e374081c07720e77c61effff)
* | Update QDeclarativeTextInput to match accessibility changesAlan Alpert2011-05-162-2/+1
|/ | | | Reviewed-by: Martin Jones
* uses the cached argument infoCharles Yin2011-05-162-21/+6
| | | | | Change-Id: I884516c9c20425bfd17a2db7d5541fbc5cff41c6 (cherry picked from commit b4613a346effee81f10bee99a6a8d3064cbdd13e)
* register canvas and related classessCharles Yin2011-05-161-0/+7
|
* canvasitem implementation based on painteditemCharles Yin2011-05-166-0/+3887
|
* add toImage() function to QSGPainterNodeCharles Yin2011-05-162-0/+8
|
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Eckhart Koppen2011-05-133-8/+8
|\ | | | | | | into qtquick2
| * Call QSGPaintedItem::paint() when the scene graph is synced.Yoann Lopes2011-05-133-8/+8
| | | | | | | | | | At that moment the GUI thread is blocked and it is therefore safe to call paint() from the scenegraph thread.
* | Update module version number to 5.0.0Eckhart Koppen2011-05-131-3/+3
| | | | | | | | | | Updated .pri file variables (cherry picked from commit a7fe708da19d6757322f871777ba16ace3721561)
* | Honor -nomake for examples and demosEckhart Koppen2011-05-131-0/+6
|/ | | | | | | Don't build or install demos and examples when they are disabled. Reviewed-by: TrustMe (cherry picked from commit 61c0b5c3923956db53408ad3513488f6f4893c2f)
* cache the arguments in property cache dataCharles Yin2011-05-132-3/+33
| | | | | Change-Id: Ie02b94c2ddb1d5d7b7bb6556a01a5ae86a438c57 (cherry picked from commit 39fed3e2601935c1d6834bb5e75266e5b280e5cd)
* Fix QSGBorderImage autotest.Yann Bodson2011-05-132-58/+19
|
* QmlDirParser: Fix typeInfo accessor.Christian Kamm2011-05-121-1/+1
| | | | | Reviewed-by: Kai Koehne (cherry picked from commit 7fcda24112d690575007ddcb11e097a9c33e0f19)