aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix access to context properties within TextEdit.cursorDelegateAndrew den Exter2012-02-141-2/+3
| | | | | | | | | | Don't create the cursorDelegate instance before componentComplete as the context may not be fully populated prior to that. Task-number: QTBUG-21780 Change-Id: I6ca8a24989bc28e5c5ca06d61a85e32ff630ce7c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Better document with examples how relative paths are resolved.Andrew den Exter2012-02-141-0/+14
| | | | | Change-Id: Ia52956889216d11d7bb10307f09b582b55d0b4cd Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Qt.application.inputPanel to make deprecation warning only oncePekka Vuorela2012-02-131-1/+5
| | | | | Change-Id: I6db04fdbf648e0b91e7ef21f57b6062813ceb6c5 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Fixed QML Item updates after reparenting.Kim Motoyoshi Kalland2012-02-131-4/+6
| | | | | | | | | | Setting an Item's parent to null caused its scene graph nodes to be deleted, but resetting the parent to a valid object did not recreate and update all the nodes. Task-number: QTBUG-21032 Change-Id: I00f93a481a326ba9b9fb98bf4212479622552783 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Change variant properties to var properties.Justin McPherson2012-02-132-5/+5
| | | | | | | Helps with the use of js objects in test data etc. Change-Id: I95661118a8ded277c0e1d3c951182dee3f550e12 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Don't crash when an animation update causes it to delete itself.Michael Brasser2012-02-135-18/+76
| | | | | Change-Id: Ic108adfb99a09e6ede71d474240fb0917cee6961 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove non-standard canvas filter/mirror functionsCharles Yin2012-02-132-183/+1
| | | | | | | | | They are not standard context 2d APIs, and now the same effects can be implemented by the ShaderEffect/QtGraphicEffects as well, so remove them from canvas 2d to reduce the duplicated features. Change-Id: If77ea6794e839a59927a313702aeea2282384844 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add basic TouchCancel handling to canvas.Laszlo Agocs2012-02-131-0/+21
| | | | | | | | | | This makes sure that touchEvent() is properly called for all items in the scene that have an active touch. It does not handle the cancel event in any other special way. Change-Id: Id66527ced8cb63d0b29f25f37c139e6d6aec9ba0 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* qmltest: Remove obsolete skipAll function.Jason McDonald2012-02-131-6/+0
| | | | | | | | | | The skipAll function has been left in qmltest for a transitional period to give upstream projects time to catch up with the removal of the function from the API. This transitional period is now finished. Task-number: QTBUG-21652 Change-Id: I10173ef9a676b804e6cf2e7f6e9a82f7b7b4c078 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qmltest: Count passes, fails and skips consistently.Jason McDonald2012-02-134-21/+19
| | | | | | | | | | | | | | | | | | | | | This commit changes qmltest to count one pass per data row, rather than a single pass for an entire data-driven test function. This makes counting of passes consistent with counting of fails and skips which were already counted once per data row. This change also means that the plain-text, xml and light-xml output formats will now show one result per data row, so that every data row executed will be shown in the test output with either a pass, fail or skip result. Previously data rows that passed were not shown in the output, preventing analysis of total number of tests runs, pass-rates, and various other metrics. This commit corresponds to (and depends on) a commit in the qtbase module which changes the behaviour of qtestlib in the same way. Task-number: QTBUG-21848 Task-number: QTBUG-22124 Change-Id: I3c1f0e68bdff4087b9ccfc80a3f96f4541335b6f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* QML Text: make sure that the bounding rect has a y position of 0.Yann Bodson2012-02-131-0/+1
| | | | | | | This line was lost in a previous merge. Change-Id: If3683fa17630452abab115638c1c0ebf0824e2a1 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Change linkage of datafunction in V8_DEFINE_EXTENSION to static.Justin McPherson2012-02-132-2/+2
| | | | | | | Stops interaction with items of the same name elsewhere. Change-Id: I37ffdc8253d76247f03bd593785a35069636eba8 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Make sure polish() is reentrant.Justin McPherson2012-02-131-4/+5
| | | | | | | | | Take a copy of the items currently scheduled for polish (and clear the internal list) to ensure an item can re-add itself to the polish list during an updatePolish(). Change-Id: I0c629795f64d5926ac87a838ea5e216b6a1fa6cf Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix anchor jitters that could occur during animation.Michael Brasser2012-02-131-14/+4
| | | | | | | | | | | | The anchors were using a different definition of center than the actual center (9337c140cab7db1285f893b66d0e56423a74c253). With this change center-anchored Rectangles may sometimes have fuzzy antialiasing again. Task-number: QTBUG-12441 Task-number: QTBUG-21730 Change-Id: Iaf61409c7c523510d0d657fe7ba96f29a8610090 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Track the animationRunning flag correctly in ↵Charles Yin2012-02-111-0/+1
| | | | | | | | | | | | | | QQuickRenderThreadSingleContextWindowManager The animationRunning value in QQuickRenderThreadSingleContextWindowManager should always match the animation driver's running state. When the renderer starts rendering, should check and update the animationRunning to the current animation driver's isRunning() value after killing the animation timer. Change-Id: I30b55872ae1fc69b8db47ead7f1f2ee86de966c8 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Debugger: Rename QDeclarativeDebugTrace to QDeclarativeProfilerServiceKai Koehne2012-02-1014-109/+109
| | | | | | | | This avoids naming confusion with QDeclarativeTrace + makes it in line with QV8ProfilerService. Change-Id: Ifd801655044cff3ffdb2a9695ffc9868eeb51663 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Debugger: Consistenly use 'state' instead of 'status'Kai Koehne2012-02-1018-101/+101
| | | | | | | | | Fix inconsistent naming e.g. in QtDeclarativeEngineDebug by always using 'state' instead of 'status'. This is in line with the other source code, which also seems to favor 'state'. Change-Id: I65a7a3bd0eb7dfffeb37b5f8dad15b0a4a78de70 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Use QInputMethod instead of deprecated QInputPanelPekka Vuorela2012-02-1013-35/+48
| | | | | | | | | | Similarly deprecate Qt.application.inputPanel and introduce replacement Qt.inputMethod. Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Sami Kananoja <sami.kananoja@nokia.com>
* Flickable containing PinchArea is unresponsive following pinch.Martin Jones2012-02-101-3/+0
| | | | | | | | | | | PinchArea was releasing the mouse grab when all touches were released, causing the mouse release event to not be propagated to its parents, who were then unable to correct their state. Remove this code and allow the normal event handlers to do their thing. Change-Id: I367772ca13546425fed4bed4438084bdf3c74dde Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Refactor Canvas rendering paths.Justin McPherson2012-02-1012-378/+960
| | | | | | | Refactor Canvas rendering paths to enable different drawing contexts. Change-Id: If0e00a14baa673fca6b999a787b4e89885bb1e51 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix for QTBUG-23862 - Blank screen in ViewportChristopher Ham2012-02-101-5/+4
| | | | | | | | | | This patch fixes an issue that causes Qt3D's Viewport to be blank when its renderMode property is set to BufferedRender. (QSGPainterNode's RenderTarget is set to FramebufferObject) Task-number: QTBUG-23862 Change-Id: Ic7a333f79ecf1aa153ef42e213644a17243a3580 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Remove clang warnings in particlesYann Bodson2012-02-102-7/+8
| | | | | Change-Id: I4fb92a76143e5b9b607bbf9461b27ade3776edf0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update SmoothedAnimation and SpringAnimation to accept default target.Michael Brasser2012-02-104-6/+10
| | | | | | | Followup to f5a43c09dbbf0caece4976303250a7582f6037ec. Change-Id: I591836996b815f3128b5f67f11efcc644011d6b4 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Use use touch events to generate mouse events in Quick canvas.Martin Jones2012-02-104-19/+184
| | | | | | | | | | | | Allowing the canvas to deal with mouse event emulation provides a couple of advantages: 1. touches outside a reactive area can be ignored, allowing a touch within a reactive area to become the "mouse touch". 2. we can extend the mouse events with data available in touch events for use within the quick elements; specifically velocity in this case. Change-Id: Id9df397f1a3a03dbda2ef5dcf6189e7eb3377356 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Added new convenience readonly visibleChildren property to ItemMathias Malmqvist2012-02-103-6/+74
| | | | | | Change-Id: I5ec541226fabd72c05ce8ccb8bb7e56f6ec7717a Task-number: 22724 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Doc fixAlan Alpert2012-02-091-3/+3
| | | | | Change-Id: I94712d5e7ca81618c4c506f5984ff94c46b730dd Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove deprecated builtin sql database API.Charles Yin2012-02-096-631/+2
| | | | | | | | | | | The new local storage API has been implemented as a standalone module plugin for a while, and qtquick1 has been moved into a seperated repo, so the old API can be safely removed now. Task-number:QTBUG-21538 Change-Id: Ib89f34797afe492ad4987d5afa8ff23cdca044ab Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Debugger: Allow trace service to send data on exitKai Koehne2012-02-097-15/+61
| | | | | | | | Add a statusAboutToBeChanged virtual that allows services to send data e.g. on application exit. Change-Id: I28fa513ab2a12d6973c444aac3062d64a0957207 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlProfiler: add filename to "Compiling" events locationChristiaan Janssen2012-02-091-0/+1
| | | | | Change-Id: I58c4cae59790bed6a921f7e94d97ee84ba3e6777 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Pass the QQuickCanvas to texture factories.Gunnar Sletta2012-02-098-11/+12
| | | | | | | | | This makes it a lot more convenient as we then have direct access to the GL context, createTexture(), invalidation signal and more. Change-Id: I114514d1379c4d0efcc35c512fa2b485da3438b0 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Add linkColor property to Text.Andrew den Exter2012-02-097-15/+68
| | | | | | | | | | | | | | | Allows the color of links in text to be changed from the default blue. This currently only works with StyledText and the distance field rendererer. It could be made to work with RichText overwriting the specified foreground color in all instances or by not setting a default color in the html parser. The former would prevent the color being set with CSS or some future means for altering text formats. The latter would break rendering with QPainter. Task-number: QTBUG-23048 Change-Id: I98df215cabe8a089f648fd4a6206622b4318fb8f Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Check dynamic slot function for nullness before evaluationChris Adams2012-02-092-3/+34
| | | | | | | | | | | | | | Previously, we didn't check whether the function object handle associated with a dynamic slot's method index was null before attempting to evaluate it, which could cause a crash in some circumstances. This change also adds better error reporting during function compilation. Task-number: QTBUG-24064 Task-number: QTBUG-24037 Task-number: QTBUG-23387 Change-Id: I3c5e35e8c16187870125736013a5935fcc5cb1f2 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Use QDeclarativePixmap in the Particle SystemAlan Alpert2012-02-099-97/+326
| | | | | | | This allows for source URLs to come from network sources. Change-Id: I416edca010e77e507598eaf4eead4291f044f379 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove code related to test location.Jason McDonald2012-02-094-40/+1
| | | | | | | | | Testlib no longer does anything with the test location and neither do any of Qt's tests, so this code is no longer needed. Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Make use of the new maybeAdvance animation logic inside the animation systemGunnar Sletta2012-02-091-1/+1
| | | | | Change-Id: Ifef986241d4817fe1e8f8cb94b9640b2bcec0d29 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Handle exceptions while compiling v8 bindingsChris Adams2012-02-092-9/+37
| | | | | | | | | | | | | Previously, no exception handling existed, which could cause a crash if an invalid v8 binding expression was generated. Such invalid bindings should usually be rewritten into valid form by the bindings rewriter, but in some cases it is too costly to do so, so we need to handle exceptions. Task-number: QTBUG-24064 Task-number: QTBUG-23387 Change-Id: I7da12a936780a561c9e9cad3a4a7b62c06d6973e Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix warnings reported by clang.Michael Brasser2012-02-094-8/+9
| | | | | Change-Id: Ifa850c2848c61319cb2465d7fcfffc7fef630923 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Rewrite multiline strings properlyAlan Alpert2012-02-097-13/+136
| | | | | | | | | | | | | | | | Because the bindings rewriter works on code strings, it would leave multiline strings across multiple lines (which is illegal in ECMAScript. It now manually breaks them up when it sees them, by replacing a \n character with a literal \n. Since RewriteSignalHandler now likes to have the AST passed in too, the related method in QDeclarativeCompiler (and its customers) have been altered to use the QDeclarativeScript::Value instead of just a string. Task-number: QTBUG-23387 Change-Id: Id060de37e70590c9da2a902038ed02d948fdd70f Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* qmltest: Perform extra checks after each data row is executed.Jason McDonald2012-02-094-1/+11
| | | | | | | | | Add calls to the new function QTestResult::finishedCurrentTestData() to verify that expected failures and expected messages have been produced. Change-Id: Ia139a962c705a5f47be992b7f2e81775aa2e2f28 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Add missing interface declarationCharles Yin2012-02-081-0/+2
| | | | | Change-Id: I18774f01b78f160b53c3ee96f1fe3a4cc8ce4950 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update documentation on QJSEngine::newQObject to match implementation.Jamey Hicks2012-02-081-1/+1
| | | | | Change-Id: Id38244dd78b7d562dad14e08555fb55d2e0815fa Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Use a singleton for the plugin.Gunnar Sletta2012-02-081-8/+8
| | | | | | | | | | The factory is created from the QQuickCanvas constructor before any alternative threads are started and doesn't need this kind of protected. In addition this caused problems on shutdown if multiple custom contexts where created. Change-Id: Ifdd9bde0c65aa7c399722aea33af78087a2465b4 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* CodeCoverage: Fix wrong type passed to saveCoverageTool.Caroline Chao2012-02-081-1/+1
| | | | | | | Passing a bool as appropriate. Change-Id: I0dcca8d30c6d75e7fcddcf7047e1dd1c572ec6ea Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Switch to QMetaType::TypeAlan Alpert2012-02-081-12/+15
| | | | | | | | Looks like this change was made to QVariant for Qt5, slight behavioural difference because floats are now a separate case. Change-Id: Ia9d420b03454c13c97515ab9c89b743a668b37e2 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Provide determinant accessor in render state structure.Glenn Watson2012-02-086-1/+28
| | | | | | | | | | | This allows custom renderers to set the determinant to a value different than the actual model view transform matrix. This is useful when parts of the scene node transformation are done on the CPU rather than in the vertex shader. Change-Id: Icf26a5922b0933275a61af4656cf842bf61e70d5 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Added QQuickCanvas::setRenderTarget(uint fbo, const QSize &size)Gunnar Sletta2012-02-087-7/+85
| | | | | | | This allows to hook in non-QOpenGLFrameBufferObject FBO's also Change-Id: I8a2f8f7f15d5a92262bdbb0507b232d7c11fdf25 Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
* Accept default targets for transitionsBea Lam2012-02-088-39/+76
| | | | | | | | | | | | QDeclarativeAbstractAnimation::transition(), QDeclarativeTransition::prepare() and QDeclarativeTransitionManager now accept a QObject* to specify a default target for a transition. For view transitions, this will allow the view to pass a view item as the default target for a view transition so that the Transition does not have to explicitly set the target for every animation. Change-Id: I2c8d5535283335e139d98ef56f399f338627fb3e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Don't hide virtual method.Michael Brasser2012-02-082-6/+6
| | | | | | Task-number: QTBUG-20994 Change-Id: Iaeeb23ed758ef52e0a3a61c4310aafec383e8a28 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Let Item.layer.samplerName be a QByteArray instead of QString.Kim Motoyoshi Kalland2012-02-072-10/+10
| | | | | | | | Both Qt's property system and OpenGL shaders use 8-bit characters, so there is no need to use a QString for samplerName. Change-Id: I8cc29c74adb5d71a34cc99d9ecebbbba8b554cdf Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Allow Item components to be assigned to Item.layer.effect.Kim Motoyoshi Kalland2012-02-072-4/+5
| | | | | | | | | Some complex effects are easier to implement as Items using ShaderEffects internally rather than with a top-level ShaderEffect. Auto-tests added. Change-Id: I4b99811b87e7ca5054bf119b99207b7f5a7c666e Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>