Alan Alpert [Mon, 23 May 2011 03:08:02 +0000 (13:08 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 23 May 2011 03:07:21 +0000 (13:07 +1000)]
Fixed switching between particle performance modes
Actually switches shaders, and does not lose emitted particle data.
Charles Yin [Sat, 21 May 2011 13:53:11 +0000 (23:53 +1000)]
qmltestcase.prf moved to qtbase
Bjørn Erik Nilsen [Fri, 20 May 2011 13:04:07 +0000 (15:04 +0200)]
Fixes wrong flipping of textures.
Reviewed-by: Gunnar
Kim Motoyoshi Kalland [Fri, 20 May 2011 12:50:59 +0000 (14:50 +0200)]
Removed virtual type() from QSGNode, member variable instead.
Kim Motoyoshi Kalland [Fri, 20 May 2011 11:42:16 +0000 (13:42 +0200)]
Use QDataBuffer instead of QVector in QMLRenderer.
Using QDataBuffer instead of QVector reduces the number of
memory reallocations.
Kai Koehne [Fri, 20 May 2011 12:25:24 +0000 (14:25 +0200)]
QDeclarativeDebug: Fix autotest
Update the number of objects to be expected
Chris Adams [Fri, 20 May 2011 05:47:46 +0000 (15:47 +1000)]
Fix implicit qmldir imports unit test
Previously, the tst_qdeclarativemoduleplugin::implicitQmldir() test
worked only under shadow-built Qt. Now it works under in-src build
as well.
Reviewed-by: Martin Jones
Change-Id: Ie1395a8b93aba6e02f00bb047169d76f05ec10d9
Martin Jones [Fri, 20 May 2011 05:39:07 +0000 (15:39 +1000)]
Support 'mirror: true' in SG Image element.
Change-Id: Id94e5557e8ebbed4494fb342b87b8b595e01b38b
Charles Yin [Fri, 20 May 2011 03:12:52 +0000 (13:12 +1000)]
fix the build order error
Change-Id: I4b25a67462908367155fee3b104546c94db01b70
Charles Yin [Fri, 20 May 2011 01:57:29 +0000 (11:57 +1000)]
Integrate QtQuickTest into Qt
Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316
Task-number:QTBUG-16082
Martin Jones [Fri, 20 May 2011 01:37:06 +0000 (11:37 +1000)]
Some of the QML C++ methods should be slots.
Change-Id: Ib9465cf2a7638d013ce831f49ed0177741c22ab0
Yann Bodson [Fri, 20 May 2011 01:34:11 +0000 (11:34 +1000)]
Skip test in qdeclarativeimage::noLoading (QTBUG-19425)
Martin Jones [Fri, 20 May 2011 00:36:31 +0000 (10:36 +1000)]
Skip another pixmap comparison test.
Change-Id: Ie9280cfbb74d2ffa2da1ce5b6d1e5153a9b19d0f
Kim Motoyoshi Kalland [Thu, 19 May 2011 14:06:44 +0000 (16:06 +0200)]
Avoid using indices in the RectangleNode implementation.
Task-number: QTBUG-18731
Casper van Donderen [Thu, 19 May 2011 14:08:12 +0000 (16:08 +0200)]
Fix typo.
Kim Motoyoshi Kalland [Thu, 19 May 2011 13:31:35 +0000 (15:31 +0200)]
Improved RectangleNode implementation.
Task-number: QTBUG-18731
Casper van Donderen [Thu, 19 May 2011 12:49:30 +0000 (14:49 +0200)]
Add .pro file to fix build.
Reviewed-by: Kevin Wright
Casper van Donderen [Thu, 19 May 2011 09:12:01 +0000 (11:12 +0200)]
Add TextBalloon QML Scene Grpah example with documentation. I moved an old example over to a subfolder.
Reviewed-by: Gunnar Sletta
Alan Alpert [Thu, 19 May 2011 08:43:59 +0000 (18:43 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Thu, 19 May 2011 08:43:12 +0000 (18:43 +1000)]
Add BurstEmitter, and a simple render path for UltraParticles
None of the intermediate paths are written though. It's all or virtually
nothing.
Kim Motoyoshi Kalland [Thu, 19 May 2011 08:32:41 +0000 (10:32 +0200)]
Update unit test according to intended behaviour change.
The behaviour was changed in commit
9d7eb51da37e8dffbe284fc564c9b9f08a89bea2.
Kim Motoyoshi Kalland [Thu, 19 May 2011 08:26:55 +0000 (10:26 +0200)]
Re-apply "Support mirroring the source rectangle of ShaderEffectSource."
This reverts commit
616c7e768f3d88f6b8be6af72290769e99500e72.
Alan Alpert [Thu, 19 May 2011 08:02:21 +0000 (18:02 +1000)]
Normalize createQmlObject error message
Martin Jones [Thu, 19 May 2011 07:24:07 +0000 (17:24 +1000)]
Fix unstable test.
Change-Id: I336b6a02b763c3be9b01a074f641cb031cf18268
Martin Jones [Thu, 19 May 2011 06:19:44 +0000 (16:19 +1000)]
Link item focus to canvas widget focus.
Change-Id: I7da1db30819c80b48f4c285a43274b668c686826
Andrew den Exter [Thu, 19 May 2011 03:59:40 +0000 (13:59 +1000)]
Remove QEXPECT_FAIL from QSGTextInput test.
The QSGPaintedItem::setContentSize() function has now been implemented.
Change-Id: I620824073143de5e50c8ce2e4f886dc60dd79e64
Kim Motoyoshi Kalland [Wed, 18 May 2011 15:49:06 +0000 (17:49 +0200)]
Fixed crash when Image/ShaderEffectSource source is missing.
Kim Motoyoshi Kalland [Wed, 18 May 2011 11:48:18 +0000 (13:48 +0200)]
Added documentation for GridMesh.
Alan Alpert [Wed, 18 May 2011 11:11:51 +0000 (21:11 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Wed, 18 May 2011 11:10:00 +0000 (21:10 +1000)]
Add UltraParticle
They're not as cool as they sound. Includes example, and the now
pointless SuperParticle (for possible performance comparisions).
Andrew den Exter [Wed, 18 May 2011 07:00:49 +0000 (17:00 +1000)]
Fix test TextEdit preeditMicroFocus test failure.
Port change from QDeclarativeTextEdit test which removed a check for
an update when the cursor position had not changed.
Yann Bodson [Wed, 18 May 2011 06:16:00 +0000 (16:16 +1000)]
Skip mirror autotests while QTBUG-19351 and QTBUG-19252 are not resolved.
Martin Jones [Wed, 18 May 2011 04:15:40 +0000 (14:15 +1000)]
Make SG Text test work by disabling pixmap comparison.
This won't work with scenegraph. Manual test needed.
Yann Bodson [Wed, 18 May 2011 04:16:23 +0000 (14:16 +1000)]
More autotests fixes.
Charles Yin [Wed, 18 May 2011 03:46:16 +0000 (13:46 +1000)]
show initial chart in motion chart example
Change-Id: I39297ced1c532f633a7c9c6c64c0818bbc852084
Charles Yin [Wed, 18 May 2011 03:31:42 +0000 (13:31 +1000)]
fix motion chart example bug
Change-Id: I0d00d224d815210c8ef45f2289e9ec4d0adea6b5
Yann Bodson [Wed, 18 May 2011 03:21:39 +0000 (13:21 +1000)]
Fix QSGBorderImage autotest.
QtQuick 1.0 -> QtQuick 2.0
Chris Adams [Wed, 18 May 2011 02:32:28 +0000 (12:32 +1000)]
Revert "Support mirroring the source rectangle of ShaderEffectSource."
This reverts commit
155faa3b8b1e04241bd53df3eb008d54a71cc667.
The original commit broke behavior enforced by the tst_qdeclarativeqt
unit test, specifically relating to QRectF.
Charles Yin [Wed, 18 May 2011 02:04:06 +0000 (12:04 +1000)]
add motion chart canvas example
Change-Id: Iccce2c4fc2bdeb4289093fa9675440eff589ae41
Jason McDonald [Wed, 18 May 2011 00:45:16 +0000 (10:45 +1000)]
Reduce usage of Q_ASSERT in autotests.
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)
Jason McDonald [Wed, 4 May 2011 02:54:10 +0000 (12:54 +1000)]
Remove Q_ASSERT from qdeclarativexmllistmodel test
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)
Jason McDonald [Wed, 4 May 2011 02:26:59 +0000 (12:26 +1000)]
Remove Q_ASSERT's from ecmascript test.
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)
Jason McDonald [Fri, 15 Apr 2011 06:15:39 +0000 (16:15 +1000)]
Remove Q_ASSERT from QDeclarativeListModel autotest.
Change-Id: Ic15b747fa50bcec54df748b173b299058f69c681
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
59a6e6200984ccbb862b8758436a5e88b8c40bbc)
Jason McDonald [Fri, 15 Apr 2011 05:25:45 +0000 (15:25 +1000)]
Remove redundant Q_ASSERT from qmlvisual autotest.
Change-Id: I5c413793ee6322b5be1ae52658362803dc4c2010
Task-number: QTBUG-17582
Reviewed-by: Alan Alpert
(cherry picked from commit
d6bd4db2db6dbefec327e226bf54a69a20690a45)
Jason McDonald [Fri, 15 Apr 2011 04:15:49 +0000 (14:15 +1000)]
Remove Q_ASSERT calls that wrap side-effecting code.
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)
Yann Bodson [Tue, 17 May 2011 06:07:14 +0000 (16:07 +1000)]
Add autotests to .pro file
Yann Bodson [Tue, 17 May 2011 05:50:03 +0000 (15:50 +1000)]
Make QSGImage autotests compile.
Charles Yin [Mon, 16 May 2011 03:49:56 +0000 (13:49 +1000)]
skip unit tests if no required OpenGL 2.0 feature on this platform
Change-Id: I68feb5938339f327b45cf66b7aec1c582753f18d
Alan Alpert [Tue, 17 May 2011 03:48:20 +0000 (13:48 +1000)]
Fix emitter burst method bugs
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.
Martin Jones [Mon, 16 May 2011 23:17:36 +0000 (09:17 +1000)]
Kim Motoyoshi Kalland [Mon, 16 May 2011 14:57:41 +0000 (16:57 +0200)]
Added documentation for ShaderEffectItem.
Also removed unused signal.
Kim Motoyoshi Kalland [Mon, 16 May 2011 08:57:12 +0000 (10:57 +0200)]
Added documentation for ShaderEffectSource.
Yann Bodson [Mon, 16 May 2011 04:09:05 +0000 (14:09 +1000)]
Compile without qt3support
Alan Alpert [Mon, 16 May 2011 03:23:22 +0000 (13:23 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Yann Bodson [Mon, 16 May 2011 03:14:44 +0000 (13:14 +1000)]
Fix QSGBorderImage and QSGAnimatedImage autotests
Alan Alpert [Mon, 16 May 2011 01:59:36 +0000 (11:59 +1000)]
Update QDeclarativeTextInput to match accessibility changes
Reviewed-by: Martin Jones
Aaron Kennedy [Mon, 16 May 2011 01:08:38 +0000 (11:08 +1000)]
Doc
Change-Id: I25f1885ef285fb3bd14c1f499b9f42e38bba5ec6
Task-number: QTBUG-19265
(cherry picked from commit
01a374fe8a6ac0b6e374081c07720e77c61effff)
Charles Yin [Tue, 15 Mar 2011 02:11:00 +0000 (12:11 +1000)]
uses the cached argument info
Change-Id: I884516c9c20425bfd17a2db7d5541fbc5cff41c6
(cherry picked from commit
b4613a346effee81f10bee99a6a8d3064cbdd13e)
Charles Yin [Mon, 16 May 2011 00:20:12 +0000 (10:20 +1000)]
register canvas and related classess
Charles Yin [Mon, 16 May 2011 00:15:24 +0000 (10:15 +1000)]
canvasitem implementation based on painteditem
Charles Yin [Mon, 16 May 2011 00:14:34 +0000 (10:14 +1000)]
add toImage() function to QSGPainterNode
Eckhart Koppen [Fri, 13 May 2011 20:00:00 +0000 (23:00 +0300)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Eckhart Koppen [Fri, 13 May 2011 10:30:08 +0000 (13:30 +0300)]
Update module version number to 5.0.0
Updated .pri file variables
(cherry picked from commit
a7fe708da19d6757322f871777ba16ace3721561)
Eckhart Koppen [Fri, 13 May 2011 18:51:24 +0000 (21:51 +0300)]
Honor -nomake for examples and demos
Don't build or install demos and examples when they are disabled.
Reviewed-by: TrustMe
(cherry picked from commit
61c0b5c3923956db53408ad3513488f6f4893c2f)
Yoann Lopes [Fri, 13 May 2011 13:57:51 +0000 (15:57 +0200)]
Call QSGPaintedItem::paint() when the scene graph is synced.
At that moment the GUI thread is blocked and it is therefore safe to
call paint() from the scenegraph thread.
Charles Yin [Tue, 15 Mar 2011 02:10:01 +0000 (12:10 +1000)]
cache the arguments in property cache data
Change-Id: Ie02b94c2ddb1d5d7b7bb6556a01a5ae86a438c57
(cherry picked from commit
39fed3e2601935c1d6834bb5e75266e5b280e5cd)
Yann Bodson [Fri, 13 May 2011 03:35:49 +0000 (13:35 +1000)]
Fix QSGBorderImage autotest.
Christian Kamm [Thu, 12 May 2011 11:41:11 +0000 (13:41 +0200)]
QmlDirParser: Fix typeInfo accessor.
Reviewed-by: Kai Koehne
(cherry picked from commit
7fcda24112d690575007ddcb11e097a9c33e0f19)
Gunnar Sletta [Thu, 12 May 2011 10:54:54 +0000 (12:54 +0200)]
When calling update() on a QSGItem during the sync phase, we did not update.
The QSGCanvas autotest did this.
Reviewed-by: Kim
Gunnar Sletta [Thu, 12 May 2011 07:42:16 +0000 (09:42 +0200)]
Don't crash when the shader source is null.
Roberto Raggi [Thu, 12 May 2011 09:44:17 +0000 (11:44 +0200)]
Added auto tests for properties initialized using JS statements
Roberto Raggi [Thu, 12 May 2011 09:31:31 +0000 (11:31 +0200)]
Fix the QML front-end to allow side effects in the initializer.
Task-number: QTBUG-15117
Kim Motoyoshi Kalland [Wed, 11 May 2011 15:46:06 +0000 (17:46 +0200)]
Output warning if using unsupported texture wrap mode.
The REPEAT wrap mode is not supported by default for non-
power-of-two textures in OpenGL ES 2. Output warning in
QSGTexture::updateBindOptions() in debug mode.
Alan Alpert [Thu, 12 May 2011 05:43:29 +0000 (15:43 +1000)]
Upgrade Flickr demo to QtQuick 2.
And throw in particle effects.
Includes a variety of fixes to modelparticle and picture affector which
were arrived at during this demo.
Rohan McGovern [Wed, 11 May 2011 22:47:43 +0000 (08:47 +1000)]
tests: build autotests by default for qtdeclarative
Configure Qt with `-nomake tests' if you don't want the tests.
Reviewed-by: Jason McDonald
Change-Id: I1af6a231b9cfb8ecf3e3a0c932ead6ddff7bbe90
Rohan McGovern [Wed, 11 May 2011 23:52:48 +0000 (09:52 +1000)]
tests: mark tst_qsgitem as a private-test
This test uses private symbols.
Reviewed-by: Jason McDonald
Change-Id: I026f4d00be5f53203d0b155e08533474cc4d9605
Rohan McGovern [Thu, 12 May 2011 00:00:26 +0000 (10:00 +1000)]
Fixed incorrect usage of `signals', `slots' in headers
Qt headers must use Q_SIGNALS, Q_SLOTS.
Reviewed-by: Jason McDonald
Change-Id: I54b3322befd8f133d44aa48f3aa7cd96785d2e24
Martin Jones [Thu, 12 May 2011 04:34:48 +0000 (14:34 +1000)]
Improve error message for invalid image provider name.
Also fix broken qdeclarativeimageprovider test.
Martin Jones [Thu, 12 May 2011 03:40:02 +0000 (13:40 +1000)]
Compile.
Kim Motoyoshi Kalland [Wed, 11 May 2011 13:12:08 +0000 (15:12 +0200)]
Fixed image tiling on scene graph.
Repeat wrapping of non-power-of-two textures is not supported
on OpenGL ES 2 by default. This commit implements a fallback
for tiled QML Images.
Yoann Lopes [Wed, 11 May 2011 13:55:01 +0000 (15:55 +0200)]
Fixes crash in PaintedItem example when using threaded rendering.
Gunnar Sletta [Wed, 11 May 2011 10:56:51 +0000 (12:56 +0200)]
Documentation and API cleanup of QSGMaterial
Gunnar Sletta [Wed, 11 May 2011 10:54:41 +0000 (12:54 +0200)]
Delete the rendering thread when shutting down
Gunnar Sletta [Wed, 11 May 2011 05:55:56 +0000 (07:55 +0200)]
Stop the render thread before deleting the QSGCanvas.
Alan Alpert [Wed, 11 May 2011 09:11:51 +0000 (19:11 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Wed, 11 May 2011 09:11:18 +0000 (19:11 +1000)]
Add private parts to autotest .pro files
Alan Alpert [Wed, 11 May 2011 07:53:22 +0000 (17:53 +1000)]
Augment Documentation
Task-number: QTBUG-18235
Chris Adams [Tue, 10 May 2011 02:10:06 +0000 (12:10 +1000)]
Add user documentation for scarce resource properties
Relates to commit
59ace5c5a666b1588560d2aeaa79a57da535e863.
Task-number: QMLNG-18
Reviewed-by: Aaron Kennedy
Change-Id: I216ced4c663ebab8003978999dc16ac809443a5f
Kim Motoyoshi Kalland [Tue, 10 May 2011 14:38:44 +0000 (16:38 +0200)]
Replaced grab() with scheduleUpdate().
Replaced the synchronous function grab() with an asynchronous
function scheduleUpdate() in QShaderEffectSource because
synchronous grabbing doesn't work with threaded rendering.
Yoann Lopes [Tue, 10 May 2011 11:12:14 +0000 (13:12 +0200)]
Documented which thread gets the QSGPaintedItem::paint() call.
Eskil Abrahamsen Blomfeldt [Tue, 10 May 2011 10:18:55 +0000 (12:18 +0200)]
Update to work with QGlyphs -> QGlyphRun renaming
Just some search replace to make the repository compile after
QGlyphs and related APIs were renamed.
Yoann Lopes [Tue, 10 May 2011 10:11:24 +0000 (12:11 +0200)]
Added a separate property to enable mipmapping on QSGPaintedItem.
Don't use QSGItem's smooth property for that anymore.
Kai Koehne [Tue, 10 May 2011 09:42:03 +0000 (11:42 +0200)]
QmlViewer: Remove one call to enableDebugging
Merge
f9b198987d2 resulted in two calls of the method.
Reviewed-by: TrustMe
Kai Koehne [Mon, 2 May 2011 12:03:35 +0000 (14:03 +0200)]
QmlViewer: Translate UI
Install translators for the Qt & QmlViewer translations. also
add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated
strings.
Reviewed-by: Oswald Buddenhagen
Task-number: QTBUG-14848
(cherry-picked from commit
f33b31dcc1b8fd35501ab5b441a4529e2f8570f3)
Martin Jones [Tue, 10 May 2011 05:34:37 +0000 (15:34 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Martin Jones [Tue, 10 May 2011 04:46:10 +0000 (14:46 +1000)]
Benchmark component creation with different types of bindings.
Chris Adams [Tue, 10 May 2011 02:14:09 +0000 (12:14 +1000)]
Add user documentation for js imports functionality
Relates to commit
6f8637810e549dac3ee8386f199a997d21ac85ce.
Task-number: QMLNG-18
Reviewed-by: Martin Jones
Change-Id: I96f0e2ebc4206d6c2a0fda476d214e549666a69c
Kim Motoyoshi Kalland [Mon, 9 May 2011 14:59:37 +0000 (16:59 +0200)]
Fix Rectangle implementation.
Yoann Lopes [Mon, 9 May 2011 15:16:16 +0000 (17:16 +0200)]
Udate mipmaps when QSGPaintedItem's texture has changed.