profile/ivi/qtdeclarative.git
13 years agoRemove webkit dependencies from qtdeclarative.
Martin Jones [Fri, 27 May 2011 03:00:47 +0000 (13:00 +1000)]
Remove webkit dependencies from qtdeclarative.

The webkit examples and demo should be added to webkit repo.
See https://bugs.webkit.org/show_bug.cgi?id=61596

Change-Id: Iffb2c5eb7f95a9bb563ad61c6002274cec54cd24

13 years agoSkip the qdeclarativeimage and qdeclarativeborderimage mirror test
Martin Jones [Fri, 27 May 2011 02:07:55 +0000 (12:07 +1000)]
Skip the qdeclarativeimage and qdeclarativeborderimage mirror test

Also mark qmlvisual tests as CONFIG+=insignificant_test

Change-Id: I0febeafca4d9aa08ac17a99c97880520be78a35a

13 years agoRevert "Make QSGTextNode back-end for QML's TextInput"
Martin Jones [Fri, 27 May 2011 02:06:20 +0000 (12:06 +1000)]
Revert "Make QSGTextNode back-end for QML's TextInput"

This reverts commit e430f1336881850a73a54a291e0276160d568212.

13 years agoMake tests compile.
Martin Jones [Fri, 27 May 2011 01:30:17 +0000 (11:30 +1000)]
Make tests compile.

Change-Id: Iecb50641f927b82533e25262ba1ab8a0a14a108c

13 years agoRemove webkit dependency from test.
Aaron Kennedy [Fri, 27 May 2011 00:44:13 +0000 (10:44 +1000)]
Remove webkit dependency from test.

This wasn't a real dependency anyway, as all the code that used it
is commented out.

13 years agoTextures not scheduled for deletion while scrolling QML view.
Bjørn Erik Nilsen [Thu, 26 May 2011 13:12:37 +0000 (15:12 +0200)]
Textures not scheduled for deletion while scrolling QML view.

This happened when scrolling a view using an Image delegate (containing
QSGTexture). All textures were deleted at exit, but it is important to
immediately schedule the texture for deletion whenever the delegate is
destroyed to avoid unnecessary high memory consumption.

Task-number: QTBUG-19511
Reviewed-by: gunnar
13 years agoMulti-line sprite files will now work
Alan Alpert [Thu, 26 May 2011 05:30:20 +0000 (15:30 +1000)]
Multi-line sprite files will now work

13 years agoRevert "uses the cached argument info"
Charles Yin [Wed, 25 May 2011 03:45:25 +0000 (13:45 +1000)]
Revert "uses the cached argument info"

This reverts commit 68d18d77ebac49c2b863c425969c70c5426864cd.

13 years agoRevert "cache the arguments in property cache data"
Charles Yin [Wed, 25 May 2011 03:45:18 +0000 (13:45 +1000)]
Revert "cache the arguments in property cache data"

This reverts commit 30327650798ba63281c7b9344c9d824d00dce82a.

13 years agoFix QSGImage autotest.
Yann Bodson [Wed, 25 May 2011 03:23:30 +0000 (13:23 +1000)]
Fix QSGImage autotest.

13 years agoImplement "mirror" property for BorderImage.
Martin Jones [Mon, 23 May 2011 07:09:58 +0000 (17:09 +1000)]
Implement "mirror" property for BorderImage.

Change-Id: Iee5b252ce1b0d39da42f553cf2ae782ad14d297f
Reviewed-by: Gunnar
13 years agoSmall optimizations in distance-field cache.
Yoann Lopes [Tue, 24 May 2011 09:43:17 +0000 (11:43 +0200)]
Small optimizations in distance-field cache.

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Mon, 23 May 2011 14:04:21 +0000 (16:04 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Mon, 23 May 2011 11:51:45 +0000 (13:51 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoOptimize distance-field glyph recycling.
Yoann Lopes [Mon, 23 May 2011 11:39:53 +0000 (13:39 +0200)]
Optimize distance-field glyph recycling.

Unused glyphs in the cache should not be overwritten if they are
immediatly reused after being unreferenced.

13 years agoSet paintNode to 0 after deleting it.
Gunnar Sletta [Mon, 23 May 2011 11:45:31 +0000 (13:45 +0200)]
Set paintNode to 0 after deleting it.

Otherwise, we will get crashes if we're switching back and froth
between ItemHasContent set to true and false.

13 years agoDon't store texture references after the view has gone away
Gunnar Sletta [Mon, 23 May 2011 10:45:12 +0000 (12:45 +0200)]
Don't store texture references after the view has gone away

This is a partial fix only. We will eventually need to get
proper sharing of resources across multiple GL contexts, but this
fixes the autotest and will work for most usecases.

The task QTBUG-19455 has been created to solve it properly.

13 years agoMake QSGTextNode back-end for QML's TextInput
Eskil Abrahamsen Blomfeldt [Mon, 9 May 2011 10:07:55 +0000 (12:07 +0200)]
Make QSGTextNode back-end for QML's TextInput

To get the benefit of different glyph node backends, the
TextInput item has now been moved over on SceneGraph's
TextNode instead of QPainter, and selections and
decorations are painted using QSGSimpleRects.

13 years agoqmltestrunner not installed by default
Charles Yin [Mon, 23 May 2011 11:41:19 +0000 (21:41 +1000)]
qmltestrunner not installed by default

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 23 May 2011 09:04:33 +0000 (19:04 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoCompile on Mac
Alan Alpert [Mon, 23 May 2011 09:04:17 +0000 (19:04 +1000)]
Compile on Mac

13 years agoFix typo in API: QSGContext::schdelueTextureForCleanup.
Bjørn Erik Nilsen [Mon, 23 May 2011 08:39:58 +0000 (10:39 +0200)]
Fix typo in API: QSGContext::schdelueTextureForCleanup.

Reviewed-by: kim
13 years agoSupport change slots for properties starting with '_'
Chris Adams [Mon, 23 May 2011 05:22:37 +0000 (15:22 +1000)]
Support change slots for properties starting with '_'

According to ECMA-262r3, property names may begin with a letter,
underscore ('_'), dollar sign ('$'), or unicode escape sequence.
We previously supported Change slots for properties only if the
property name began with a letter; this patch adds support for
properties which begin with one or more underscore.

Task-number: QTBUG-17950
Reviewed-by: Aaron Kennedy
Change-Id: I6f28bde18a38e32c2131e0990fe0f69bda36f90e

13 years agoEnsure that showDirs is respected in FolderListModel
Chris Adams [Mon, 23 May 2011 05:38:53 +0000 (15:38 +1000)]
Ensure that showDirs is respected in FolderListModel

Calling index() on a QDirModel can modify the filters applied.
This patch to FolderListModel ensures that filtering is reset if
required, so that programmatically selecting a subfolder in a
folder does not cause that subfolder to become visible if showDirs
is set to false.

Task-number: QTBUG-17837
Reviewed-by: Martin Jones
Change-Id: I449321d5170ecedf2a0cb36483d50020305a26dd

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 23 May 2011 05:34:05 +0000 (15:34 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoRemove ModelParticle
Alan Alpert [Mon, 23 May 2011 05:33:06 +0000 (15:33 +1000)]
Remove ModelParticle

Nothing is using it anymore, lets keep it that way.

13 years agoFix QtDeclarative keyinteraction example
Yann Bodson [Mon, 23 May 2011 05:20:02 +0000 (15:20 +1000)]
Fix QtDeclarative keyinteraction example

Task-number: QTBUG-19033
(cherry picked from commit 00a72cd1f5aff15d5a3a59d61efd2f5653d7dd34)

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 23 May 2011 05:17:20 +0000 (15:17 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoSplit up ModelParticle
Alan Alpert [Mon, 23 May 2011 05:16:00 +0000 (15:16 +1000)]
Split up ModelParticle

Now has DataParticle (with model and delegate) and an ItemParticle
(which you just feed items manually). ModelParticle left for now for
damage control - it will probably just disappear someday.

13 years agoFix QDeclarativeImage test
Yann Bodson [Mon, 23 May 2011 04:44:10 +0000 (14:44 +1000)]
Fix QDeclarativeImage test

Use smaller images that fit in the cache.

Task-number: QTBUG-19425

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
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

13 years agoFixed switching between particle performance modes
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.

13 years agoqmltestcase.prf moved to qtbase
Charles Yin [Sat, 21 May 2011 13:53:11 +0000 (23:53 +1000)]
qmltestcase.prf moved to qtbase

13 years agoFixes wrong flipping of textures.
Bjørn Erik Nilsen [Fri, 20 May 2011 13:04:07 +0000 (15:04 +0200)]
Fixes wrong flipping of textures.

Reviewed-by: Gunnar
13 years agoRemoved virtual type() from QSGNode, member variable instead.
Kim Motoyoshi Kalland [Fri, 20 May 2011 12:50:59 +0000 (14:50 +0200)]
Removed virtual type() from QSGNode, member variable instead.

13 years agoUse QDataBuffer instead of QVector in QMLRenderer.
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.

13 years agoQDeclarativeDebug: Fix autotest
Kai Koehne [Fri, 20 May 2011 12:25:24 +0000 (14:25 +0200)]
QDeclarativeDebug: Fix autotest

Update the number of objects to be expected

13 years agoFix implicit qmldir imports unit test
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

13 years agoSupport 'mirror: true' in SG Image element.
Martin Jones [Fri, 20 May 2011 05:39:07 +0000 (15:39 +1000)]
Support 'mirror: true' in SG Image element.

Change-Id: Id94e5557e8ebbed4494fb342b87b8b595e01b38b

13 years agofix the build order error
Charles Yin [Fri, 20 May 2011 03:12:52 +0000 (13:12 +1000)]
fix the build order error

Change-Id: I4b25a67462908367155fee3b104546c94db01b70

13 years agoIntegrate QtQuickTest into Qt
Charles Yin [Fri, 20 May 2011 01:57:29 +0000 (11:57 +1000)]
Integrate QtQuickTest into Qt

Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316
Task-number:QTBUG-16082

13 years agoSome of the QML C++ methods should be slots.
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

13 years agoSkip test in qdeclarativeimage::noLoading (QTBUG-19425)
Yann Bodson [Fri, 20 May 2011 01:34:11 +0000 (11:34 +1000)]
Skip test in qdeclarativeimage::noLoading (QTBUG-19425)

13 years agoSkip another pixmap comparison test.
Martin Jones [Fri, 20 May 2011 00:36:31 +0000 (10:36 +1000)]
Skip another pixmap comparison test.

Change-Id: Ie9280cfbb74d2ffa2da1ce5b6d1e5153a9b19d0f

13 years agoAvoid using indices in the RectangleNode implementation.
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

13 years agoFix typo.
Casper van Donderen [Thu, 19 May 2011 14:08:12 +0000 (16:08 +0200)]
Fix typo.

13 years agoImproved RectangleNode implementation.
Kim Motoyoshi Kalland [Thu, 19 May 2011 13:31:35 +0000 (15:31 +0200)]
Improved RectangleNode implementation.

Task-number: QTBUG-18731

13 years agoAdd .pro file to fix build.
Casper van Donderen [Thu, 19 May 2011 12:49:30 +0000 (14:49 +0200)]
Add .pro file to fix build.

Reviewed-by: Kevin Wright
13 years agoAdd TextBalloon QML Scene Grpah example with documentation. I moved an old example...
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
13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
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

13 years agoAdd BurstEmitter, and a simple render path for UltraParticles
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.

13 years agoUpdate unit test according to intended behaviour change.
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.

13 years agoRe-apply "Support mirroring the source rectangle of ShaderEffectSource."
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.

13 years agoNormalize createQmlObject error message
Alan Alpert [Thu, 19 May 2011 08:02:21 +0000 (18:02 +1000)]
Normalize createQmlObject error message

13 years agoFix unstable test.
Martin Jones [Thu, 19 May 2011 07:24:07 +0000 (17:24 +1000)]
Fix unstable test.

Change-Id: I336b6a02b763c3be9b01a074f641cb031cf18268

13 years agoLink item focus to canvas widget focus.
Martin Jones [Thu, 19 May 2011 06:19:44 +0000 (16:19 +1000)]
Link item focus to canvas widget focus.

Change-Id: I7da1db30819c80b48f4c285a43274b668c686826

13 years agoRemove QEXPECT_FAIL from QSGTextInput test.
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

13 years agoFixed crash when Image/ShaderEffectSource source is missing.
Kim Motoyoshi Kalland [Wed, 18 May 2011 15:49:06 +0000 (17:49 +0200)]
Fixed crash when Image/ShaderEffectSource source is missing.

13 years agoAdded documentation for GridMesh.
Kim Motoyoshi Kalland [Wed, 18 May 2011 11:48:18 +0000 (13:48 +0200)]
Added documentation for GridMesh.

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
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

13 years agoAdd UltraParticle
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).

13 years agoFix test TextEdit preeditMicroFocus test failure.
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.

13 years agoSkip mirror autotests while QTBUG-19351 and QTBUG-19252 are not resolved.
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.

13 years agoMake SG Text test work by disabling pixmap comparison.
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.

13 years agoMore autotests fixes.
Yann Bodson [Wed, 18 May 2011 04:16:23 +0000 (14:16 +1000)]
More autotests fixes.

13 years agoshow initial chart in motion chart example
Charles Yin [Wed, 18 May 2011 03:46:16 +0000 (13:46 +1000)]
show initial chart in motion chart example

Change-Id: I39297ced1c532f633a7c9c6c64c0818bbc852084

13 years agofix motion chart example bug
Charles Yin [Wed, 18 May 2011 03:31:42 +0000 (13:31 +1000)]
fix motion chart example bug

Change-Id: I0d00d224d815210c8ef45f2289e9ec4d0adea6b5

13 years agoFix QSGBorderImage autotest.
Yann Bodson [Wed, 18 May 2011 03:21:39 +0000 (13:21 +1000)]
Fix QSGBorderImage autotest.

QtQuick 1.0 -> QtQuick 2.0

13 years agoRevert "Support mirroring the source rectangle of ShaderEffectSource."
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.

13 years agoadd motion chart canvas example
Charles Yin [Wed, 18 May 2011 02:04:06 +0000 (12:04 +1000)]
add motion chart canvas example

Change-Id: Iccce2c4fc2bdeb4289093fa9675440eff589ae41

13 years agoReduce usage of Q_ASSERT in autotests.
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)

13 years agoRemove Q_ASSERT from qdeclarativexmllistmodel test
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)

13 years agoRemove Q_ASSERT's from ecmascript test.
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)

13 years agoRemove Q_ASSERT from QDeclarativeListModel autotest.
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)

13 years agoRemove redundant Q_ASSERT from qmlvisual autotest.
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)

13 years agoRemove Q_ASSERT calls that wrap side-effecting code.
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)

13 years agoAdd autotests to .pro file
Yann Bodson [Tue, 17 May 2011 06:07:14 +0000 (16:07 +1000)]
Add autotests to .pro file

13 years agoMake QSGImage autotests compile.
Yann Bodson [Tue, 17 May 2011 05:50:03 +0000 (15:50 +1000)]
Make QSGImage autotests compile.

13 years agoskip unit tests if no required OpenGL 2.0 feature on this platform
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

13 years agoFix emitter burst method bugs
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.

13 years agoApply 2081a3d0fd7266ffba83849fee967e048e991270 to SG TextInput
Martin Jones [Mon, 16 May 2011 23:17:36 +0000 (09:17 +1000)]
Apply 2081a3d0fd7266ffba83849fee967e048e991270 to SG TextInput

13 years agoAdded documentation for ShaderEffectItem.
Kim Motoyoshi Kalland [Mon, 16 May 2011 14:57:41 +0000 (16:57 +0200)]
Added documentation for ShaderEffectItem.

Also removed unused signal.

13 years agoAdded documentation for ShaderEffectSource.
Kim Motoyoshi Kalland [Mon, 16 May 2011 08:57:12 +0000 (10:57 +0200)]
Added documentation for ShaderEffectSource.

13 years agoCompile without qt3support
Yann Bodson [Mon, 16 May 2011 04:09:05 +0000 (14:09 +1000)]
Compile without qt3support

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
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

13 years agoFix QSGBorderImage and QSGAnimatedImage autotests
Yann Bodson [Mon, 16 May 2011 03:14:44 +0000 (13:14 +1000)]
Fix QSGBorderImage and QSGAnimatedImage autotests

13 years agoUpdate QDeclarativeTextInput to match accessibility changes
Alan Alpert [Mon, 16 May 2011 01:59:36 +0000 (11:59 +1000)]
Update QDeclarativeTextInput to match accessibility changes

Reviewed-by: Martin Jones
13 years agoDoc
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)

13 years agouses the cached argument info
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)

13 years agoregister canvas and related classess
Charles Yin [Mon, 16 May 2011 00:20:12 +0000 (10:20 +1000)]
register canvas and related classess

13 years agocanvasitem implementation based on painteditem
Charles Yin [Mon, 16 May 2011 00:15:24 +0000 (10:15 +1000)]
canvasitem implementation based on painteditem

13 years agoadd toImage() function to QSGPainterNode
Charles Yin [Mon, 16 May 2011 00:14:34 +0000 (10:14 +1000)]
add toImage() function to QSGPainterNode

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
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

13 years agoUpdate module version number to 5.0.0
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)

13 years agoHonor -nomake for examples and demos
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)

13 years agoCall QSGPaintedItem::paint() when the scene graph is synced.
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.

13 years agocache the arguments in property cache data
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)

13 years agoFix QSGBorderImage autotest.
Yann Bodson [Fri, 13 May 2011 03:35:49 +0000 (13:35 +1000)]
Fix QSGBorderImage autotest.

13 years agoQmlDirParser: Fix typeInfo accessor.
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)

13 years agoWhen calling update() on a QSGItem during the sync phase, we did not update.
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