profile/ivi/qtdeclarative.git
13 years agoWhen we create textureprovider, initialize it with the texture if we got it
Gunnar Sletta [Thu, 15 Sep 2011 13:28:24 +0000 (15:28 +0200)]
When we create textureprovider, initialize it with the texture if we got it

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>
13 years agoSupport preedit text in QSGTextInput
Eskil Abrahamsen Blomfeldt [Thu, 15 Sep 2011 09:49:12 +0000 (11:49 +0200)]
Support preedit text in QSGTextInput

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>
13 years agoUse QWindow's surface format for QSGCanvas' GL context
Gunnar Sletta [Thu, 15 Sep 2011 10:35:27 +0000 (12:35 +0200)]
Use QWindow's surface format for QSGCanvas' GL context

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>
13 years agoFix pre-edit text in in QSGTextEdit
Eskil Abrahamsen Blomfeldt [Wed, 14 Sep 2011 10:13:28 +0000 (12:13 +0200)]
Fix pre-edit text in in QSGTextEdit

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>
13 years agoSeparate declarative builtin functions from QV8Engine class
Jędrzej Nowacki [Wed, 7 Sep 2011 08:56:25 +0000 (10:56 +0200)]
Separate declarative builtin functions from QV8Engine class

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>
13 years agoRemove some unused includes.
Jędrzej Nowacki [Tue, 6 Sep 2011 14:39:05 +0000 (16:39 +0200)]
Remove some unused includes.

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>
13 years agoFix QJSValue autotest.
Jędrzej Nowacki [Tue, 13 Sep 2011 14:23:57 +0000 (16:23 +0200)]
Fix QJSValue autotest.

The test depends on widgets library.

Change-Id: I22cd3cbf9b3a2e3ed8d5c28cd8d5e44b6e33c4f1
Reviewed-on: http://codereview.qt-project.org/4792
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoSplit qjsconverter_p header.
Jędrzej Nowacki [Thu, 8 Sep 2011 07:45:55 +0000 (09:45 +0200)]
Split qjsconverter_p header.

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>
13 years agoRemove dead code.
Jędrzej Nowacki [Mon, 5 Sep 2011 15:14:21 +0000 (17:14 +0200)]
Remove dead code.

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>
13 years agoFix potential memory corruption.
Jędrzej Nowacki [Mon, 5 Sep 2011 13:36:19 +0000 (15:36 +0200)]
Fix potential memory corruption.

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>
13 years agoCleanup includes in QDeclarativeData.
Jędrzej Nowacki [Mon, 5 Sep 2011 12:14:11 +0000 (14:14 +0200)]
Cleanup includes in QDeclarativeData.

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>
13 years agoWe need to set the OpenGLSurface surface type on QSGCanvas.
Samuel Rødal [Wed, 14 Sep 2011 13:51:20 +0000 (15:51 +0200)]
We need to set the OpenGLSurface surface type on QSGCanvas.

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>
13 years agoRemove unnecessary updateInputContext function from QSGCanvasPrivate
Joona Petrell [Mon, 12 Sep 2011 19:08:35 +0000 (22:08 +0300)]
Remove unnecessary updateInputContext function from QSGCanvasPrivate

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>
13 years agoPass Qt::ImQueryInput instead of Qt::CursorRectangle in QSgItem::updateMicroFocus...
Joona Petrell [Mon, 12 Sep 2011 18:48:40 +0000 (21:48 +0300)]
Pass Qt::ImQueryInput instead of Qt::CursorRectangle in 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>
13 years agoUpdate QtQuick 2 "What's New" docs.
Martin Jones [Thu, 15 Sep 2011 03:34:19 +0000 (13:34 +1000)]
Update QtQuick 2 "What's New" docs.

Change-Id: I46714a94ea88436e90d7e3eafbc2953940c5fa94
Reviewed-on: http://codereview.qt-project.org/4932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFixed compile of qtdeclarative examples.
Rohan McGovern [Wed, 14 Sep 2011 01:39:54 +0000 (11:39 +1000)]
Fixed compile of qtdeclarative examples.

Change-Id: I3a982de8eaf31267a4d90e3cc3bedbf87400d34a
Reviewed-on: http://codereview.qt-project.org/4847
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoFix anchorRewindBug test failure.
Michael Brasser [Thu, 15 Sep 2011 00:09:10 +0000 (10:09 +1000)]
Fix anchorRewindBug test failure.

Task-number: QTBUG-21396

Change-Id: Ie4397242a953a3b1504873b7fbc63719d0e99081
Reviewed-on: http://codereview.qt-project.org/4927
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoTest fixes.
Michael Brasser [Thu, 15 Sep 2011 04:11:49 +0000 (14:11 +1000)]
Test fixes.

Change-Id: Icaf5f287ce5f8fe954c55ec7a60308659ccce547
Reviewed-on: http://codereview.qt-project.org/4935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFixed compile on mac (workaround for build system bug)
Rohan McGovern [Thu, 15 Sep 2011 04:35:08 +0000 (14:35 +1000)]
Fixed compile on mac (workaround for build system bug)

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>
13 years agoDisable compilation of tests/auto/qmltest
Rohan McGovern [Wed, 14 Sep 2011 01:32:02 +0000 (11:32 +1000)]
Disable compilation of tests/auto/qmltest

QtQuickTest has currently been disabled, so this test cannot be
compiled.

Change-Id: I93171125fafe58d925925aa6575290dab9122d4a
Reviewed-on: http://codereview.qt-project.org/4845
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agocommented out broken autotests
Matthew Cattell [Tue, 13 Sep 2011 14:55:58 +0000 (16:55 +0200)]
commented out broken autotests

Change-Id: I8bc382afc90c0a1bda0aaab6ab5284560fdfa7d4

13 years agomarked some tests as insignificant for now
Matthew Cattell [Tue, 13 Sep 2011 13:46:57 +0000 (15:46 +0200)]
marked some tests as insignificant for now

Change-Id: I2c309d3a8da30ce2c2fa8529c76e1b3a26226d54

13 years agoFixed failing test in QSGFocusScope.
Matthew Cattell [Tue, 13 Sep 2011 09:09:31 +0000 (11:09 +0200)]
Fixed failing test in QSGFocusScope.

added some waits and removed unnecessary lines from autotest

Change-Id: I847bde6db5222b12d0f0b88a8c323fd09aad9d7c

13 years agofixed broken test
Matthew Cattell [Tue, 13 Sep 2011 08:56:17 +0000 (10:56 +0200)]
fixed broken test

Change-Id: I75655620bcd12b9a59eedde0bad489c4d31bbb2e

13 years agofix declarative to work after broken refactor
Gunnar Sletta [Tue, 13 Sep 2011 10:23:27 +0000 (12:23 +0200)]
fix declarative to work after broken refactor

Change-Id: I5a30f8c45e21344060ea6e61d440d6fea822f9de

13 years agoMerge branch 'refactor'
Gunnar Sletta [Tue, 13 Sep 2011 08:21:53 +0000 (10:21 +0200)]
Merge branch 'refactor'

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

13 years agoReset on system change
Alan Alpert [Tue, 13 Sep 2011 02:03:13 +0000 (12:03 +1000)]
Reset on system change

Otherwise it tried to maintain its data, which is not useful when we
should just reset anyways.

Change-Id: Id7bbabed67d8549d4842c1e5e6bf87ba93508d62
Reviewed-on: http://codereview.qt-project.org/4705
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFixed tst_qgstextinput
Toby Tomkins [Tue, 13 Sep 2011 01:57:58 +0000 (11:57 +1000)]
Fixed tst_qgstextinput

In commit e71904e231e27e6f6f88b35c4a7e2d7cf8ba2640, this was commented
out, this does not relate to the removal of v8 from declarative.
(related http://codereview.qt-project.org/#change,3093)

Change-Id: Idcc23e27577df6f53ddf256c1ea74bf7ecc5c351
Reviewed-on: http://codereview.qt-project.org/4621
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRefactor SpriteEngine out of StochasticEngine
Alan Alpert [Mon, 12 Sep 2011 23:39:11 +0000 (09:39 +1000)]
Refactor SpriteEngine out of StochasticEngine

Also add ParticleGroups which use only StochasticStates
Simplistic change for now, just to focus the API for the
particle system. ParticleGroup elements replace the particleStates
property on the system, and the term "group" is now used more
consistently.

Change-Id: I6456f9c521b8166ccd94ea953275557bcfbf6423
Reviewed-on: http://codereview.qt-project.org/4699
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoImplement Turbulence properly
Alan Alpert [Fri, 9 Sep 2011 07:21:14 +0000 (17:21 +1000)]
Implement Turbulence properly

Or at least closer to. Now uses curl noise off of a source noise image,
documented as usable, and not an immense performance drain (just a
normal one).

Change-Id: Iac11c98cd9589cbe6a41b2b30893ab40d541d18f
Reviewed-on: http://codereview.qt-project.org/4510
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoDocument Particle type
Alan Alpert [Wed, 7 Sep 2011 02:19:01 +0000 (12:19 +1000)]
Document Particle type

Change-Id: I22db94cd55f02461cbe8e56b4fb6d3c1db0180a1
Reviewed-on: http://codereview.qt-project.org/4297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoReduce compile warnings
Alan Alpert [Fri, 9 Sep 2011 02:09:42 +0000 (12:09 +1000)]
Reduce compile warnings

Also change QSGDirection::sample to pass by value.

Change-Id: I878649158b78da22afdf77b5f3ce3263ce1070cd
Reviewed-on: http://codereview.qt-project.org/4497
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoOrder of operations fix
Alan Alpert [Fri, 9 Sep 2011 04:44:04 +0000 (14:44 +1000)]
Order of operations fix

Recycling needs to be done always, and currently here is the only time
it's supposed to happen each tick.

Change-Id: Ia03b2a6d1d884bdee784b47c447745c7e3aee2c6
Reviewed-on: http://codereview.qt-project.org/4508
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoMake activeGroups usable.
Alan Alpert [Fri, 9 Sep 2011 04:45:20 +0000 (14:45 +1000)]
Make activeGroups usable.

It actually relied on functionality inside the affectSystem method,
when it was intended to be used in subclass reimplmentations. That
functionality is now in the function itself.

Change-Id: Ie01f5a5d18a15ca207422869d221d75d63b17789
Reviewed-on: http://codereview.qt-project.org/4509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agofixed failing autotest
Matthew Cattell [Mon, 12 Sep 2011 15:29:06 +0000 (17:29 +0200)]
fixed failing autotest

Change-Id: I3a21821ce870af75741afcb3219a552e2fc5a155
Reviewed-on: http://codereview.qt-project.org/4688
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agocanvas item refactors
Charles Yin [Tue, 9 Aug 2011 06:44:38 +0000 (16:44 +1000)]
canvas item refactors

1.Supports tiled canvas with canvasSize, tileSize and canvasWindow
2.Supports different rendering targets: Canvas.Image and
  Canvas.FrameBufferObject by renderTarget property
3.Supports thread rendering when possible by threadRendering property.
4.Refactors QSGContext2D code, move some logic to
  QSGContext2DCommandBuffer,QSGContext2DTexture,QSGContext2DTile, etc
5.Updates/adds some canvas examples
6.Some improvements for context2d API
   6.1 drawImage() now loads image asynchoronously and draw images
       automatically when they are ready
   6.2 adds fillRule supports
   6.3 add svg path supports
   6.4 Pixel operations (getImageData/putImageData/createImageData)
       now have better performance by using V8 indexed array accessors
   6.5 Uses QTransform instead of QMatrix
   6.6 Gradients/patterns now are V8 values, not QObjects
   6.7 Supports measureText and TextMetrics interface
   6.8 Gives not support warnings for unimplemented functions
       (drawFocusRing,setCaretSelectionRect,caretBlinkRate)
   6.9 Better error handling, throw standard DOM exceptions according
       to the HTML5 context2d spec.
   6.10 Adds shear, resetTransform to matrix operations
   6.11 Adds roundedRect, ellipse, text to path operations
   6.12 Adds new features to CanvasImageData interface
      1) adds mirror() function
      2) adds filter() function, include the following filters:
          Threshold
          GrayScale
          Brightness
          Invert
          Blur
          Blend
          Opaque
          Convolute
7. Adds documentations

Change-Id: Id19224260d6a3fdc589d1f9681c34a88a7e7b3e5
Reviewed-on: http://codereview.qt-project.org/3621
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoFix QtDeclarative refactor branch clean compilation
Joona Petrell [Mon, 12 Sep 2011 14:20:53 +0000 (17:20 +0300)]
Fix QtDeclarative refactor branch clean compilation

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>
13 years agochanged include to use newly public qsgvertexcolormaterial header
Matthew Cattell [Mon, 12 Sep 2011 13:43:09 +0000 (15:43 +0200)]
changed include to use newly public qsgvertexcolormaterial header

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>
13 years agoImplement QSGVertexColorMaterial::compare and make the class public
Gunnar Sletta [Sun, 11 Sep 2011 07:26:05 +0000 (09:26 +0200)]
Implement QSGVertexColorMaterial::compare and make the class public

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>
13 years agoorient the fbo rendering the same way as other fbo rendering and enable multisampling
Gunnar Sletta [Sun, 11 Sep 2011 06:54:05 +0000 (08:54 +0200)]
orient the fbo rendering the same way as other fbo rendering and enable 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>
13 years agoClang build fix: Add "this->" to avoid undeclared identifier
Takumi ASAKI [Fri, 9 Sep 2011 13:23:20 +0000 (15:23 +0200)]
Clang build fix: Add "this->" to avoid undeclared identifier

Change-Id: I0957e61b34c4b43fd50b6051db599adf7ebb4306
Reviewed-on: http://codereview.qt-project.org/4549
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
13 years agoMerge branch 'master' into refactor
Gunnar Sletta [Mon, 12 Sep 2011 06:12:58 +0000 (08:12 +0200)]
Merge branch 'master' into refactor

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

13 years agoPort change 67ed1849 from Qt 4.7
Martin Jones [Mon, 12 Sep 2011 02:40:20 +0000 (12:40 +1000)]
Port change 67ed1849 from Qt 4.7

Flickable could flick in wrong direction if given too few touch samples

If we got <= QML_FLICK_DISCARDSAMPLES the previous velocity was not
cleared, so the view would continue flicking with the previous
velocity, and therefore the previous direction.

Task-number: QT-4903

Change-Id: Ie4c2a3829026c0bf7d94cf5b60c0b7ff9833f725
Reviewed-on: http://codereview.qt-project.org/4618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoExperimental 'pixelAligned' property for Flickable.
Martin Jones [Fri, 9 Sep 2011 06:48:03 +0000 (16:48 +1000)]
Experimental 'pixelAligned' property for Flickable.

Change-Id: I671af87c4d2db3403ab506ae32608c91d6982338
Reviewed-on: http://codereview.qt-project.org/4506
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoRestructure test to use QTRY_ macro for instability.
Toby Tomkins [Fri, 9 Sep 2011 04:12:53 +0000 (14:12 +1000)]
Restructure test to use QTRY_ macro for instability.

Restructure test to use QTRY_ for asynchronous gui functions. Remove
reference to specific X11 and generalise event queue processing for
all platforms.

Change-Id: I38d8b7419d644ea1d8558f88b48f8b4004804c32
Reviewed-on: http://codereview.qt-project.org/4495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMake state a public property of QSGItem.
Michael Brasser [Fri, 9 Sep 2011 04:03:31 +0000 (14:03 +1000)]
Make state a public property of QSGItem.

The property type is QString, so doesn't need to be private.

Change-Id: If1d1a740be451331e8142fbe1d89fda2eeff4509
Reviewed-on: http://codereview.qt-project.org/4499
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agofixed autotest
Matthew Cattell [Thu, 8 Sep 2011 14:46:54 +0000 (16:46 +0200)]
fixed autotest
removed debug statements
Change-Id: Id09e3a6a43b5d5170d8b50b10cc35eb8c4e1f3d0
Reviewed-on: http://codereview.qt-project.org/4472
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoMake QSGItem::update() work when called from inside QSGCanvasPlainRenderLoop::paint()
Paul Olav Tvete [Fri, 9 Sep 2011 13:03:01 +0000 (15:03 +0200)]
Make QSGItem::update() work when called from inside 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>
13 years agopartial build fix of qtquick1 autotests
Matthew Cattell [Fri, 9 Sep 2011 12:53:01 +0000 (14:53 +0200)]
partial build fix of qtquick1 autotests

Change-Id: Ic2106ec80e1e5402f4f9bf71cc4cf23ec4657046
Reviewed-on: http://codereview.qt-project.org/4546
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agofixup tests to build with refactor
Matthew Cattell [Fri, 9 Sep 2011 12:50:48 +0000 (14:50 +0200)]
fixup tests to build with refactor

Change-Id: Iab4adc9e19fab67402918bb737fff2fce6c292bd
Reviewed-on: http://codereview.qt-project.org/4545
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agomake quicktest build and modify to use qwindow
Matthew Cattell [Fri, 9 Sep 2011 12:43:33 +0000 (14:43 +0200)]
make quicktest build and modify to use qwindow

Change-Id: Idebb00b828307421bcbd89d8abaa9ea1d903af47
Reviewed-on: http://codereview.qt-project.org/4542
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoFix missing and outdated license headers.
Jason McDonald [Wed, 7 Sep 2011 06:57:21 +0000 (16:57 +1000)]
Fix missing and outdated license headers.

Change-Id: I940ced2e84a86daabc5158d348b05b7532cb1c22
Reviewed-on: http://codereview.qt-project.org/4314
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoOnly polish once pr frame
Gunnar Sletta [Thu, 8 Sep 2011 14:00:07 +0000 (16:00 +0200)]
Only polish once pr frame

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>
13 years agoUpdate images in falling leaves particle demo.
Michael Brasser [Fri, 9 Sep 2011 02:06:36 +0000 (12:06 +1000)]
Update images in falling leaves particle demo.

Original images were causing warnings with libpng.

Change-Id: I697f20ee3968b0e27f12dc55eb20ea46f809a46e
Reviewed-on: http://codereview.qt-project.org/4496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoMissed an example in previous name changes
Alan Alpert [Fri, 9 Sep 2011 01:49:32 +0000 (11:49 +1000)]
Missed an example in previous name changes

One non-essential varaible still had the old name, leading to a
non-fatal warning. It is now rectified.

Change-Id: I4ebcf92b3521aeff92e4da89f41b8c81c2f6ab96
Reviewed-on: http://codereview.qt-project.org/4494
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoCompile fix.
Michael Brasser [Fri, 9 Sep 2011 00:42:05 +0000 (10:42 +1000)]
Compile fix.

Change-Id: Iac8fd75a805a7f62638275fe05123a13198d5260
Reviewed-on: http://codereview.qt-project.org/4489
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoImprove efficiency of qmlEngine()
Aaron Kennedy [Fri, 9 Sep 2011 01:12:06 +0000 (11:12 +1000)]
Improve efficiency of qmlEngine()

Also document qmlEngine() and qmlContext()

Change-Id: I83eb092490160eee72d87473befdcea1492ded13
Reviewed-on: http://codereview.qt-project.org/4491
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoadd convenient function pixmap() function for QSGImageBase
Charles Yin [Thu, 8 Sep 2011 05:00:55 +0000 (15:00 +1000)]
add convenient function pixmap() function for QSGImageBase

Change-Id: I30e5c81daf10f001120ef04fe50f347f0b8578bb
Reviewed-on: http://codereview.qt-project.org/4387
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agomake the testcase name the same in both plain text and xml/xunit logs for qmltest
Charles Yin [Fri, 2 Sep 2011 05:44:47 +0000 (15:44 +1000)]
make the testcase name the same in both plain text and xml/xunit logs for qmltest

Change-Id: I911b3c7ba698b6c94aaa712eeaa917301c651e64
Reviewed-on: http://codereview.qt-project.org/4112
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoOnly fast-foward states when there is a transition.
Michael Brasser [Thu, 8 Sep 2011 05:22:22 +0000 (15:22 +1000)]
Only fast-foward states when there is a transition.

Fast-forwarding is only required when we are animating a state change.

Task-number: QTBUG-16662
Change-Id: I20e1a056cb3268b92b606be34809bcd0e2bfb898
Reviewed-on: http://codereview.qt-project.org/4390
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoJSDebugging: Update Auto Test cases.
Aurindam Jana [Wed, 7 Sep 2011 10:44:00 +0000 (12:44 +0200)]
JSDebugging: Update Auto Test cases.

Removed multiple timers from qml file and updated test case
verification.

Change-Id: I27a9755a54c893658f76eeaf29f4813dafc71b7d
Reviewed-on: http://codereview.qt-project.org/4345
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
13 years agoExplicitly ask input method to commit preedit when focus lost.
Pekka Vuorela [Wed, 7 Sep 2011 17:55:38 +0000 (20:55 +0300)]
Explicitly ask input method to commit preedit when focus lost.

Takes advantage of new QInputPanel::commit() method.

Change-Id: I0f09353c6ac7f5503ea9fda3a9bd79d0ae3da940
Reviewed-on: http://codereview.qt-project.org/4456
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agouncomment tests
Matthew Cattell [Thu, 8 Sep 2011 13:58:13 +0000 (15:58 +0200)]
uncomment tests

Change-Id: I8aea71cfddb38fe1a24a74ca736a39e3f8817a5b
Reviewed-on: http://codereview.qt-project.org/4464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoget various autotests working for refactor
Matthew Cattell [Thu, 8 Sep 2011 13:35:51 +0000 (15:35 +0200)]
get various autotests working for refactor

Change-Id: I35a9ce1421e87351a9ce4834158d201f84280a65
Reviewed-on: http://codereview.qt-project.org/4461
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agorename QSGGeometry::stride() to sizeOfVertex for symetry with index
Gunnar Sletta [Thu, 8 Sep 2011 13:15:57 +0000 (15:15 +0200)]
rename QSGGeometry::stride() to sizeOfVertex for symetry with index

Also support GL_UNSIGNED_INT as index type when supported by GL

Change-Id: I0988e102c8a04ce6cd02fb02528204ba810f853a
Reviewed-on: http://codereview.qt-project.org/4453
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAvoid compiler warning on unused variable.
Pekka Vuorela [Wed, 7 Sep 2011 18:32:24 +0000 (21:32 +0300)]
Avoid compiler warning on unused variable.

Change-Id: Ie3d08e91aee8ecd369cb10a0c8d7497de559c046
Reviewed-on: http://codereview.qt-project.org/4458
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFix TextInput and TextEdit software input panel on qtquick1
Pekka Vuorela [Thu, 8 Sep 2011 12:12:45 +0000 (15:12 +0300)]
Fix TextInput and TextEdit software input panel on qtquick1

Change-Id: I39da7a877cef546da69bccfcf7ee1ae2ba92b208
Reviewed-on: http://codereview.qt-project.org/4455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoAdjust to the changes in the QInputMethodQuery event.
Lars Knoll [Thu, 8 Sep 2011 12:41:51 +0000 (14:41 +0200)]
Adjust to the changes in the QInputMethodQuery event.

Change-Id: I0c160f7635c87f63990ddc519cbc966ccab65f4a
Reviewed-on: http://codereview.qt-project.org/4447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
13 years agoJSDebugging: Send messages for events BeforeCompile to Client.
Aurindam Jana [Wed, 7 Sep 2011 10:46:34 +0000 (12:46 +0200)]
JSDebugging: Send messages for events BeforeCompile to Client.

Change-Id: Ia4f2a290f94cc406c64a69e443521403b94db493
Reviewed-on: http://codereview.qt-project.org/4348
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoFix TextInput and TextEdit open/closeSoftwareInputPanel functions
Joona Petrell [Thu, 8 Sep 2011 09:09:22 +0000 (12:09 +0300)]
Fix TextInput and TextEdit open/closeSoftwareInputPanel functions

Change-Id: I69bac4d1ce55271685dcddcc4c8ad2f6598e7630
Reviewed-on: http://codereview.qt-project.org/4439
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agomake sure we polishItems also in plain render loop
Gunnar Sletta [Thu, 8 Sep 2011 10:36:53 +0000 (12:36 +0200)]
make sure we polishItems also in plain render loop

Change-Id: Ife8ab271c77a8daeaca9463e72296714aba17df9
Reviewed-on: http://codereview.qt-project.org/4430
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agocompile again
Gunnar Sletta [Thu, 8 Sep 2011 10:37:36 +0000 (12:37 +0200)]
compile again

Change-Id: If041994fdadcd24f9b002bbcf76ce50f3b56ce87
Reviewed-on: http://codereview.qt-project.org/4431
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoRename ImMicroFocus to ImCursorrRctangle
Lars Knoll [Thu, 8 Sep 2011 08:58:45 +0000 (10:58 +0200)]
Rename ImMicroFocus to ImCursorrRctangle

Also set ImhMultiLine on the TextEdit

Change-Id: I563fef803660e35f39cdf1b40526356bfc0581e0
Reviewed-on: http://codereview.qt-project.org/4415
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoHandle ImEnabled and ImHints input method queries in QSGTextInput and QSGTextEdit
Joona Petrell [Wed, 7 Sep 2011 20:19:14 +0000 (23:19 +0300)]
Handle ImEnabled and ImHints input method queries in QSGTextInput and QSGTextEdit

Change-Id: I348f924f2987f1c163c89ce4eef18fe864ec665d
Reviewed-on: http://codereview.qt-project.org/4407
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoFix a typo in the method name
Lars Knoll [Wed, 7 Sep 2011 20:02:09 +0000 (22:02 +0200)]
Fix a typo in the method name

Change-Id: I8f5ca3203058dce6cc4835a5b1cd6aa0c190bcac
Reviewed-on: http://codereview.qt-project.org/4406
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoEnsure the itemTransform in QInputPanel is always up to date
Lars Knoll [Wed, 7 Sep 2011 19:55:47 +0000 (21:55 +0200)]
Ensure the itemTransform in QInputPanel is always up to date

Hook into the render loop and update the itemTransform in
the QInputPanel before we repaint.

Change-Id: If9122ba0fbe31cff3bfcc3edc48f684cc9b16984
Reviewed-on: http://codereview.qt-project.org/4405
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoAdapt to the input method changes in qtbase
Lars Knoll [Wed, 7 Sep 2011 17:58:14 +0000 (19:58 +0200)]
Adapt to the input method changes in qtbase

Start using the QInputPanel instead of the QPlatformInputContext.
Make sure we do something with both QInputMethodEvent and
QInputMethodQueryEvent. This gets input methods partially
working on TextInput fields.

Change-Id: I4655f5599673325ffb75207573635afccd069a65
Reviewed-on: http://codereview.qt-project.org/4404
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Andy Nichols
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoremoved unwanted files
Matthew Cattell [Tue, 23 Aug 2011 14:19:23 +0000 (16:19 +0200)]
removed unwanted files

Change-Id: I2785e77cfbf41e7c3a710d7990374903a6e093c8
Reviewed-on: http://codereview.qt-project.org/3413
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andy Nichols
13 years agoParticles module refactoring en masse
Alan Alpert [Tue, 6 Sep 2011 00:40:21 +0000 (10:40 +1000)]
Particles module refactoring en masse

All the little changes in one commit.

StochasticDirection -> Direction
AngledDirection -> AngleDirection
TargetedDirection -> TargetDirection
QSGCustomParticle is now Affector's implementation (C++ only refactor)
FollowEmitter -> TrailEmitter
Kill -> Age and gained lifeLeft property
ModelParticle is removed, use ItemParticle instead.
Added RectangleShape to replace Shape for the case of Rectangles
Abstract Types are no longer createable, despite sensible defaults.
GLSL variables in CustomParticle now begin with qt_
JS variables are now such that x,vx,ax are current (old ones are now
initialX, initialVX, initialAX). Same for y. A few more were extended.
Emitter::emitCap -> Emitter::maximumEmitted. Set to -1 for noCap: false
Emitter::noCap is gone.
Emitter::emitting -> Emitter::enabled
Affector::active -> Affector::enabled
Affector::collisionParticles -> Affector::whenCollidingWith
Affector::signal is gone.
PointAttractor -> Attractor
Attractor/Wander::physics -> ::affectedParameter
ParticleSystem::fastForward is gone
ParticleSystem::startTime is gone (use Emitter::startTime)
ParticleSystem::clear -> ParticleSystem::empty
And various Doc fixes.

Change-Id: Ia3b02b987f692e6f1bd14c42e575381bdfb7bbb5
Reviewed-on: http://codereview.qt-project.org/4231
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoWhitespace fix
Alan Alpert [Wed, 31 Aug 2011 08:33:57 +0000 (18:33 +1000)]
Whitespace fix

In this case, the extra space makes it fail to find the signal.

Change-Id: I18cc47e1bf979150f2fbf71edbc93aaf4b5c73c7
Reviewed-on: http://codereview.qt-project.org/3922
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoAugment Particle Docs
Alan Alpert [Thu, 1 Sep 2011 11:43:20 +0000 (21:43 +1000)]
Augment Particle Docs

Just filling out some sections.

Change-Id: I5ffe1bf558a556035745ddeae058b0b2f7ecf258
Reviewed-on: http://codereview.qt-project.org/4071
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoAllow particles to have eternal life
Alan Alpert [Thu, 1 Sep 2011 10:11:42 +0000 (20:11 +1000)]
Allow particles to have eternal life

Change-Id: I3b776a6e79cb064e826cb7b7721a3a57744225c1
Reviewed-on: http://codereview.qt-project.org/4064
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoAllow affectors to be transformed
Alan Alpert [Thu, 1 Sep 2011 08:47:26 +0000 (18:47 +1000)]
Allow affectors to be transformed

Change-Id: I4452707589d7b98709cd995569a5bf36bd5448a0
Reviewed-on: http://codereview.qt-project.org/4053
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoAdd clear property to QSGParticleSystem
Alan Alpert [Thu, 1 Sep 2011 07:59:11 +0000 (17:59 +1000)]
Add clear property to QSGParticleSystem

Makes it possible to pause the system when all particles are expired.

Change-Id: Iebeb987c2e2af261bdffa4584d75f3b108dcf050
Reviewed-on: http://codereview.qt-project.org/4046
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoAdd new path functionality.
Michael Brasser [Wed, 31 Aug 2011 22:47:56 +0000 (08:47 +1000)]
Add new path functionality.

Introduces new elements PathCurve, PathArc, PathSvg,
PathAnimation, and PathInterpolator.

Change-Id: I0f5b6284511f332e826ed373018418d2e2a8c07e
Reviewed-on: http://codereview.qt-project.org/4220
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agofixed resizemodelitem
Matthew Cattell [Wed, 7 Sep 2011 10:47:21 +0000 (12:47 +0200)]
fixed resizemodelitem

Change-Id: I5b155fc2017c1b9b0fedc7e7af398f31151dfb4d
Reviewed-on: http://codereview.qt.nokia.com/4347
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agofixed clickLink and other tests
Matthew Cattell [Wed, 7 Sep 2011 09:42:08 +0000 (11:42 +0200)]
fixed clickLink and other tests

Change-Id: Iadd83093481c14c1d565933ab0d052934c119891
Reviewed-on: http://codereview.qt.nokia.com/4328
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoFix QSGshaderEffectTexture cleanup
Gunnar Sletta [Wed, 7 Sep 2011 09:46:12 +0000 (11:46 +0200)]
Fix QSGshaderEffectTexture cleanup

Because we often created it too early it did not have a QSGContext
and would thus not clean up properly, causing crashes.

Change-Id: I1f5c82c87326254885ec217aaab4f1e79d18a243
Reviewed-on: http://codereview.qt.nokia.com/4329
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
13 years agomake render timing an environment variable
Gunnar Sletta [Wed, 7 Sep 2011 10:03:20 +0000 (12:03 +0200)]
make render timing an environment variable

Change-Id: Iadc72a0beb5e6d700b0110d11116a7533c69f311
Reviewed-on: http://codereview.qt.nokia.com/4338
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
13 years agoAnimation-like API for ParticleSystem
Alan Alpert [Thu, 1 Sep 2011 05:27:05 +0000 (15:27 +1000)]
Animation-like API for ParticleSystem

Includes skipping rendering when paused.

Change-Id: I353ac415fb877917d46ba1832ad9cb5a84640b57
Reviewed-on: http://codereview.qt.nokia.com/4041
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoAdded QSGGeometry::Attribute::isPosition to give a hint about vertex data
Gunnar Sletta [Mon, 5 Sep 2011 05:50:58 +0000 (07:50 +0200)]
Added QSGGeometry::Attribute::isPosition to give a hint about vertex data

Also added a QSGGeomtry::sizeOfIndex() function for convenience

Change-Id: If1f13afd4c1c5295dcfb00254144ef6b8b8b7878
Reviewed-on: http://codereview.qt.nokia.com/4307
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoDoc fix for QDeclarativeEngine
Damian Jansen [Wed, 7 Sep 2011 01:17:27 +0000 (11:17 +1000)]
Doc fix for QDeclarativeEngine

imageProvider return details in wrong place.

Change-Id: I5e2162b88a6bfd95222b9a7ac87d408c7740558d
Reviewed-on: http://codereview.qt.nokia.com/4295
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
13 years agoremove useless debug log
Charles Yin [Wed, 7 Sep 2011 06:47:00 +0000 (16:47 +1000)]
remove useless debug log

Change-Id: I715135c54db97df38bdd7915a01efbb3596d549a
Reviewed-on: http://codereview.qt.nokia.com/4313
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agomove QSGNodeUpdater into private header where it belongs
Gunnar Sletta [Sat, 3 Sep 2011 05:49:07 +0000 (07:49 +0200)]
move QSGNodeUpdater into private header where it belongs

Change-Id: I5cb12cac3d49cfd9b1682b405e65b2cdea4eb57d
Reviewed-on: http://codereview.qt.nokia.com/4306
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agomake test build
Matthew Cattell [Tue, 6 Sep 2011 15:41:57 +0000 (17:41 +0200)]
make test build

Change-Id: Id640db28b5a827a7f66f663684019c542987a3f4
Reviewed-on: http://codereview.qt.nokia.com/4290
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agomake test build
Matthew Cattell [Tue, 6 Sep 2011 15:33:55 +0000 (17:33 +0200)]
make test build

Change-Id: Ia22047e0c03290109f6d5489febcc750caea533f
Reviewed-on: http://codereview.qt.nokia.com/4285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoFix left alignment of native RTL pre-edit text.
Andrew den Exter [Fri, 20 May 2011 04:22:39 +0000 (14:22 +1000)]
Fix left alignment of native RTL pre-edit text.

If there is no committed text in a TextInput or TextEdit determine
if the pre-edit text is right to left before falling back to the
global keyboard settings.

Change-Id: I7e5568e936341602b8faf7be120f9a770c115f48
Task-number: QMLNG-72
Reviewed-by: Michael Brasser
Reviewed-on: http://codereview.qt.nokia.com/4176
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoFix min extents to correctly consider header size
Bea Lam [Mon, 5 Sep 2011 00:59:28 +0000 (10:59 +1000)]
Fix min extents to correctly consider header size

Regression from c0fc795f which changed implementation to always position
header at a negative position, and not just when visibleItems is empty.

Task-number: QTBUG-21207

Change-Id: I9a888e7e30b00f70835734b1e0e75e57ed282602
Reviewed-on: http://codereview.qt.nokia.com/4159
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agofixed to work with qsgcanvas
Matthew Cattell [Tue, 6 Sep 2011 14:36:01 +0000 (16:36 +0200)]
fixed to work with qsgcanvas

Change-Id: Ia044bb738469fdd2c9ecc6154ac51851db3e0e7f
Reviewed-on: http://codereview.qt.nokia.com/4270
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoqsgcanvas autotest made to work with refactor and added break statement to qsgcanvas...
Matthew Cattell [Tue, 6 Sep 2011 11:14:37 +0000 (13:14 +0200)]
qsgcanvas autotest made to work with refactor and added break statement to qsgcanvas.cpp in event processing
amended wait times / changed include for private headers
Change-Id: I4f790907268be357986e181e4624f8e54efcb2ec
Reviewed-on: http://codereview.qt.nokia.com/4256
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>