profile/ivi/qtdeclarative.git
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>
13 years agomore fixes for QTBUG-17868
Charles Yin [Tue, 6 Sep 2011 03:54:46 +0000 (13:54 +1000)]
more fixes for QTBUG-17868

QDeclarativePropertyCache bypasses the previous fix, need to check the
property name when property cache try to create property.

Change-Id: Ibccc02df568a8ded3626bb914150ba9ee87d238f
Task-number:QTBUG-17868
Reviewed-on: http://codereview.qt.nokia.com/4230
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoEnsure that header/footer resize fixes position.
Martin Jones [Tue, 6 Sep 2011 06:28:32 +0000 (16:28 +1000)]
Ensure that header/footer resize fixes position.

If the header or footer is resized the view must ensure that
it is still within bounds.

Change-Id: I5f7aa61dc9ccec8dd16457d8d4e4966434e4b1e0
Reviewed-on: http://codereview.qt.nokia.com/4236
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
13 years agoAdd garbage collector prologue callback to qv8engine
Chris Adams [Fri, 26 Aug 2011 03:54:00 +0000 (13:54 +1000)]
Add garbage collector prologue callback to qv8engine

This commit provides a generic way to manage persistent handles
created by QML so that circular references don't cause leaks, by
utilising v8's garbage collector callbacks.

Change-Id: Ia898197fdf5d86b90915b835ce3e532f7d400de4
Reviewed-on: http://codereview.qt.nokia.com/3688
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoImprovements to textFormat: Text.StyledText
Yann Bodson [Tue, 30 Aug 2011 04:40:41 +0000 (14:40 +1000)]
Improvements to textFormat: Text.StyledText

Add support for:
 - <h1> to <h6> headers
 - <p> paragraph
 - <u> underlined text
 - <a> anchor
 - <ol> <ul> <li> ordered and unordered lists (including type attribute)

Change-Id: I187e740caf19aedc46f2ab15565190ef9c40acd0
Reviewed-on: http://codereview.qt.nokia.com/3840
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
13 years agoUpdate TextEdit tests with changes from 4.8.
Andrew den Exter [Mon, 9 May 2011 03:57:34 +0000 (13:57 +1000)]
Update TextEdit tests with changes from 4.8.

Test are for changes cherry-picked to qtbase as:
8febd569408db19c8a83e16cc7a8574f9b00084b
bb2f045c10965542ae14275e8ce5a97e42931d8d

Change-Id: I186b80be1a706d8be442d4e6e5e2734ec677d235
Reviewed-on: http://codereview.qt.nokia.com/4172
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoDelay masking the last character in Password echo mode.
Andrew den Exter [Tue, 19 Jul 2011 05:15:58 +0000 (15:15 +1000)]
Delay masking the last character in Password echo mode.

If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an
integer value in milliseconds, QLineEdit and TextInput will display
the last character entered unmasked for that delay period and then
mask the character as normal.  If QT_GUI_PASSWORD_ECHO_DELAY is
not defined then the behaviour is unchanged.

Task-number: QTBUG-17003
Reviewed-by: Martin Jones
(cherry picked from commit f9e7aee2019d321edd655bfde7de43f20a106971)

Change-Id: Iddfa0daa1b39f0589cab27e5003fdd86ad81ff89
Reviewed-on: http://codereview.qt.nokia.com/4170
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoView refill operations should take qreal, not int
Bea Lam [Mon, 5 Sep 2011 01:40:10 +0000 (11:40 +1000)]
View refill operations should take qreal, not int

Regression from initial creation of QSGItemView.

Task-number: QTBUG-21281
Change-Id: I810a0b56ba4bacda49ac62b6e4c11cf9c1825c10
Reviewed-on: http://codereview.qt.nokia.com/4160
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoJSDebugging Auto Test: Fix build break.
Aurindam Jana [Mon, 5 Sep 2011 15:36:52 +0000 (17:36 +0200)]
JSDebugging Auto Test: Fix build break.

Change-Id: I7969267e6331f8d348f7206c4aff99c99294e515
Reviewed-on: http://codereview.qt.nokia.com/4216
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
13 years agoRemove friend class QV8DebugService from QV8Engine.
Aurindam Jana [Fri, 2 Sep 2011 16:05:29 +0000 (18:05 +0200)]
Remove friend class QV8DebugService from QV8Engine.

The friend class is now redundant since QVDebugService now uses only public methods of QV8Engine.

Change-Id: I492555d75bcbe08f921c5f2c3d634c691ed1223c
Reviewed-on: http://codereview.qt.nokia.com/4151
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoAuto Unit test cases for Javascript Debugging.
Aurindam Jana [Thu, 1 Sep 2011 10:32:11 +0000 (12:32 +0200)]
Auto Unit test cases for Javascript Debugging.

Change-Id: Iad2deee390deb916854795d27dc38d70891930f6
Reviewed-on: http://codereview.qt.nokia.com/4067
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoAdd examples and tests for QtQuick1
Damian Jansen [Thu, 1 Sep 2011 00:46:27 +0000 (10:46 +1000)]
Add examples and tests for QtQuick1

A straight copy of what was available in Qt 4.7, modified
where necessary to use the QtQuick1 module, so as to still
compile and run in Qt5.

Change-Id: I9a95afb96e3f522fbd600eb6dbd3fdac9558b059
Reviewed-on: http://codereview.qt.nokia.com/4019
Reviewed-by: Bea Lam <bea.lam@nokia.com>
13 years agoUpdate extension tutorials and examples to QtQuick2
Damian Jansen [Tue, 30 Aug 2011 06:18:20 +0000 (16:18 +1000)]
Update extension tutorials and examples to QtQuick2

Also add missing licence header and update example tests

Change-Id: Ic2dc8c893ddf22f646eaeba86b6f3b4a2772726c
Reviewed-on: http://codereview.qt.nokia.com/3844
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
13 years agoFix some memory leaks in the compiler
Chris Adams [Tue, 2 Aug 2011 05:41:22 +0000 (15:41 +1000)]
Fix some memory leaks in the compiler

Task-number: QTBUG-17770
Change-Id: I6d9d357bf529a9a3f414182fb6a818ddedda8e18
Reviewed-on: http://codereview.qt.nokia.com/2487
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoFix build break for QT_OPENGL_ES builds.
Jonni Rainisto [Fri, 2 Sep 2011 08:35:11 +0000 (11:35 +0300)]
Fix build break for QT_OPENGL_ES builds.

Change-Id: I1e277e79bd9b3f38e3540495e8006f1c41cfecc8
Reviewed-on: http://codereview.qt.nokia.com/4122
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Reviewed-by: Jonni Rainisto <jonni.rainisto@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoDebugger: Merge back changes from Qt Creator copy
Kai Koehne [Wed, 31 Aug 2011 10:41:04 +0000 (12:41 +0200)]
Debugger: Merge back changes from Qt Creator copy

Apply changes done to the Qt Creator copy. In Qt Creator we also support
connecting via OST, which we don't do inside QtDeclarative because it
would pull in dependencies. Anyhow, make the code align nevertheless.

Change-Id: I98f0be5ed3e136374e163cf1400df100128497ee
Reviewed-on: http://codereview.qt.nokia.com/3943
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoDebugger: Fixing coding style issues
Kai Koehne [Wed, 31 Aug 2011 10:38:54 +0000 (12:38 +0200)]
Debugger: Fixing coding style issues

Applying changes done in the Qt Creator copies.

Change-Id: I11e0547ddedd2e1f0b99d0ea586a1b209fa8d912
Reviewed-on: http://codereview.qt.nokia.com/3942
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoDebugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h
Kai Koehne [Wed, 31 Aug 2011 08:01:19 +0000 (10:01 +0200)]
Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h

Apps don't have to (directly or indirectly) include qdeclarative.h.
Instead, move the static instance to qdeclarativeengine.h, and
qdeclarativeview.h, qsgview.h (which instantiate their own engine).

Change-Id: I8b3e63ad4f134969734a2cc712395145d90e0dfa
Reviewed-on: http://codereview.qt.nokia.com/3941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoDebugger: Add private header warning to all _p.h files
Kai Koehne [Wed, 31 Aug 2011 07:23:45 +0000 (09:23 +0200)]
Debugger: Add private header warning to all _p.h files

Change-Id: Ib5cccd8a2f252a2e67c8e0fdf979c3e8114ff131
Reviewed-on: http://codereview.qt.nokia.com/3940
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoDebugger: Canonalize header defines
Kai Koehne [Wed, 31 Aug 2011 07:19:57 +0000 (09:19 +0200)]
Debugger: Canonalize header defines

Change-Id: I2cbe704326e993c47dd78182683787394f598ae4
Reviewed-on: http://codereview.qt.nokia.com/3939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoDebugger: Add missing QT_BEGIN_NAMESPACE, QT_END_NAMESPACE
Kai Koehne [Wed, 31 Aug 2011 07:17:57 +0000 (09:17 +0200)]
Debugger: Add missing QT_BEGIN_NAMESPACE, QT_END_NAMESPACE

Change-Id: I7cb404eac7a3f469fc6b1d40398ab0c40787cc8d
Reviewed-on: http://codereview.qt.nokia.com/3938
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoDebugger: Fix indentation & trailing whitespace
Kai Koehne [Wed, 31 Aug 2011 07:15:05 +0000 (09:15 +0200)]
Debugger: Fix indentation & trailing whitespace

Change-Id: I4b85b205a359e4c3adc1fcb6682945724a0910c5
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3937
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoDebugger: Also fix the name of the qdeclarativedebug autotest
Kai Koehne [Wed, 31 Aug 2011 09:30:31 +0000 (11:30 +0200)]
Debugger: Also fix the name of the qdeclarativedebug autotest

Change-Id: Ia9d31f9228b9d9e63eccaf2577bf24b3929e5fad
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3936
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoproperly initialize the dptr of QSGCanvas in the default constructor
Zeno Albisser [Fri, 2 Sep 2011 09:04:31 +0000 (11:04 +0200)]
properly initialize the dptr of QSGCanvas in the default constructor

Change-Id: Ibefa8fe0ca73674e817b87782821a26a316e8042
Reviewed-on: http://codereview.qt.nokia.com/4124
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoExported QSGShaderEffectMesh.
Kim Motoyoshi Kalland [Wed, 31 Aug 2011 15:40:42 +0000 (17:40 +0200)]
Exported QSGShaderEffectMesh.

Reintroduced the possibility to set the ShaderEffect::mesh
property to any object deriving from QSGShaderEffectMesh.

Change-Id: Idf91b2289d4e7b8fd12993a4a2bc1647dfba0ae0
Reviewed-on: http://codereview.qt.nokia.com/4003
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>