aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Sprite minor fixesAlan Alpert2012-03-203-7/+9
| | | | | | | | Spelling of "motivate", don't send out the message when they didn't set duration themselves, and update TODO comment. Change-Id: I4de055f07a1831b9d12798faeda658ff441920f4 Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Fix QQuickTextInput test failure on WindowsCharles Yin2012-03-201-3/+0
| | | | | | Task-number: QTBUG-24790 Change-Id: I1d78df79568389f8c59f99ace9e2d7685b5d8f0d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix tst_qquickitemlayer test failuresCharles Yin2012-03-203-10/+10
| | | | | | | | | The minimum window width in Windows 7 requires more than 100, so make the item width to 200 to avoid test failures. Task-number: QTBUG-24787 Change-Id: I439528a94aed9c54eca0fa68651c84afa4f9ab13 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix FolderListModel path issue on WindowsCharles Yin2012-03-203-7/+7
| | | | | | Task-number: QTBUG-24777 Change-Id: I819c2e07b23e8740f7570f117dafb2340f7c00e9 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Always enable value type support in v4.Michael Brasser2012-03-202-5/+1
| | | | | Change-Id: Ifb4e44aa6d2f13c79319d03e0fd7a4c0c3db06d8 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Support null -> QObject and QObject -> bool conversions in v4.Michael Brasser2012-03-206-0/+50
| | | | | Change-Id: I66602bf52986a388f9b6fe2bcd4630b862138906 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Remove warning about not explicitly initializing base class.Andrew den Exter2012-03-201-1/+2
| | | | | Change-Id: I786f2936a4e6c813a041950a550f06951f06bada Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Pull out some duplicate focus-related codeBea Lam2012-03-203-32/+40
| | | | | Change-Id: I920a9b75ccbdb3a9b169c7669121734c14d18ff9 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Loader could leak qml contexts if interruptedMartin Jones2012-03-202-2/+16
| | | | | | | | If Loader was either destroyed, or its source changed while it was incubating the itemContext could be leaked. Change-Id: I5b749062552954d92bf2851250f942b20ebbfe68 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix bitfield waste in QQmlContextDataMartin Jones2012-03-201-1/+1
| | | | | | | Why we do this at all, I have no idea. Change-Id: I35c78f4603499d5bb13d4608cc4f5eba0ee342ca Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Restore view to sensible position if grab is cancelled.Martin Jones2012-03-206-0/+95
| | | | | | | If the mouse grab is stolen, return to allowed bounds. Change-Id: Icc44da32ff62bed273f0ccbb5498766981cdf9a4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Allow parent to be specified for Qt.createComponentMatthew Vogt2012-03-203-5/+169
| | | | | | | | | | | | | | Add an optional parameter to the Qt.createComponent function which allows the caller to specify the object that will become the parent for the created component. If the parent is not specified by the caller, it becomes the QML engine; this behavior will change in the near future to allow these component objects to be collected when no longer referenced. Task-number: QTBUG-24840 Change-Id: I2742133fe8ab8cbc80d8012a9d9b9fc2e4596fca Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Ensure JS files imported inside modules work correctlyMatthew Vogt2012-03-1911-22/+105
| | | | | | | | | When a module exports functionality provided by a script, ensure that imported script modules inside that script resolve correctly. Task-number: QTBUG-24596 Change-Id: I3885dcc56946423f0d7cf00afdcdfaa0cb11967a Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix compiler warnings in QQmlTypeKent Hansen2012-03-191-2/+2
| | | | | | | | | | | clang said: warning: expression result unused; should this cast be to 'void'? [-Wunused-value] Change-Id: I51f9e2165f3ed550f599f4e3e7693f8e7eebbe1e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fix typo in QQmlXMLHttpRequest::readEncoding()Kent Hansen2012-03-191-1/+1
| | | | | Change-Id: I266de531c12a4b88db722f220d7693f0b6bae7ff Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove refence to declarative in the docsLars Knoll2012-03-191-1/+1
| | | | | Change-Id: I328edc6deee302440cf65de9f87e6b68c93f42b7 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use a single distance-field cache instance for all sizes of a given font.Yoann Lopes2012-03-199-343/+267
| | | | | | | | | | | Previously we had a different cache instance for each font size, but they all shared the same textures and positions. Only the glyph metrics were specific to each font size. The metrics for each font sizes are now calculated by scaling the metrics of the distance-field size (54px). Change-Id: I0d9016990dedd93318893506afb1dba7a5249e2e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Clean up dangling pointers in the particle systemGunnar Sletta2012-03-196-1/+38
| | | | | | | | | | | When the scenegraph has been invalidated all node pointers have been deleted. In the image particle case the material is managed by the nodes and must also be reset. Change-Id: I867f0d36a3ea281a58c21f04c937b16b042ef373 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Reset all node pointers when item is cleaned upGunnar Sletta2012-03-191-0/+1
| | | | | Change-Id: I5878e1d39eca3fa640f16d153924968f72bc9ffc Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Skip warning on perfectly valid usecaseGunnar Sletta2012-03-191-6/+0
| | | | | Change-Id: I83fdd2e7c569ebdfea0d21439b4db6d37c1eafa2 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix possible crash in QSGContext::invalidate()Yoann Lopes2012-03-191-4/+4
| | | | | | | | In some cases QSGContext::invalidate() was called without any current GL context when the render thread was terminated. Change-Id: Ia5295c89fe13f2473115c736e328e386d6d4d183 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QmlEngineDebug: Simplify the utility classesAurindam Jana2012-03-194-1747/+776
| | | | | Change-Id: Ie0e1b6e9edd6a09fef565635cc793f8bdb6c42e7 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlEngineDebug: Rename to QmlEngineDebugClient in AutoTestAurindam Jana2012-03-195-174/+136
| | | | | Change-Id: If20b53d2e47cdc4ed54df0d9360ae1b0566489c6 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix failed rebaseAlan Alpert2012-03-192-0/+0
| | | | | Change-Id: I5d6c6bb50baaa4c1ba986de779bad04ba45947fa Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix data file checkout formats in Windows for some declarative testsMiikka Heikkinen2012-03-192-0/+4
| | | | | | | | | Fixed by adding proper .gitattributes for the tests Task-number: QTBUG-24780 Change-Id: If8de0161a377c21fb5c6327d69e8da84174ee435 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* EasingCurveEditor: Remove generated headers from .pro fileKai Koehne2012-03-191-2/+0
| | | | | Change-Id: I21800e2839b70d6678c4958ae9c7b23a4c95f153 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Debugger: Optimize message sending in v8 profilerKai Koehne2012-03-191-10/+11
| | | | | | | Don't send every message on it's own over the network. Change-Id: I770bf45573451cb9fb0eb10b374467286ae51093 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Debugger: Always disable v4 optimizer if v8 debugger is activatedKai Koehne2012-03-193-4/+26
| | | | | | | Don't rely on QML_DISABLE_OPTIMIZER environment variable being set. Change-Id: Ib1a9d83eb9698adcd3c9a5bbcc74cba382836078 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlEngineDebugService: Rename service to QmlDebuggerAurindam Jana2012-03-195-45/+68
| | | | | | | | Rename service from QDeclarativeEngine to QmlDebugger. Send a response for each query. Change-Id: I01cfeaf3e4116bfd7029d170ee228c159973947c Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Debugger: Add optional 'host' argument to -qmljsdebuggerSimjees Abraham2012-03-197-21/+42
| | | | | Change-Id: I5bb2e48e2ad2019b8a92f6f8842b88027fcd2d28 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebuggingTests: Separate out public and private testsAurindam Jana2012-03-1932-187/+1000
| | | | | | | | | Remove dependencies on quick-private from all possible debugging auto tests and list them under public tests. Change-Id: I688b5b36fdf3d6fbcb6cef2a975ecd1bf679af2b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlProfiler: Make sure there's minimal overhead when not enabledKai Koehne2012-03-192-36/+24
| | | | | | | | | Do expensive operations directly in the constructor, guarded by and if (enabled). Also assert if the methods where this isn't feasible are called altough debugging hasn't been enabled. Change-Id: Ieaa3c71730042a88af2270203ea747af42ba5c58 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* QmlProfiler: Do not log expression for bindingKai Koehne2012-03-192-9/+0
| | | | | | | In Qt Creator 2.5, we're getting the exact text from the local sources anyway. Change-Id: I419e8e7d8cc8831b682ce619a4f8394e5be49c50 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Skip some font loader tests for WindowsCharles Yin2012-03-191-0/+21
| | | | | | | Windows currently does not support font loader yet. Change-Id: I370e41c1f2e2a45787741414a6e7bf00cc3f6c3e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't change the executable name if only build in debug mode on WindowsCharles Yin2012-03-191-3/+3
| | | | | Change-Id: I298c14d6ea5829d23a4f8b57b9c2f30546e12e80 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix qmldevtools library build error on WindowsCharles Yin2012-03-191-1/+1
| | | | | | | $$Qt.qml.sources not recongnized on Windows, use relative path instead. Change-Id: Ia30acc34eff5193bea66ff06754b1cd2b2524878 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Make qqmlinspector test work on WindowsCharles Yin2012-03-192-0/+5
| | | | | Change-Id: Ib7399f9a005d3674fcb46c605cea3a8d40c21284 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Notify QQJSE::DW of expression deletion during dtorChris Adams2012-03-191-0/+2
| | | | | | | | | | QQmlJavaScriptExpression::DeleteWatcher's wasDeleted() function simply checks to see if the pointer to the expression being watched is null. This commit ensures that the DeleteWatcher's expression pointer is set to null during QQJSE::dtor(). Change-Id: I566737bf30b4466ba96d771d9846fc3dd860cd2f Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Debugger: Fix compilation with C++11Kai Koehne2012-03-191-1/+1
| | | | | Change-Id: I6f753d14aa381fd29aadfc7c649599beb4ec4a9a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QmlDebugging: Object Tree and States ListAurindam Jana2012-03-195-43/+58
| | | | | | | | | All created instances are stored under the root context. Check for the creation context of the object when building up the tree. Do the same when building up the states list. Change-Id: I8716d9966a61b8f7cb3ad4b7ab5acd4c94b4cd03 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* When clearing an incubator also clear incubators it is waiting for.Martin Jones2012-03-192-0/+121
| | | | | | | | If an incubator is cleared while waiting for other incubators to complete also clear the incubators it is waiting for. Change-Id: I83470920c0fd8a23d0098849192555f7478bb492 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Resetting a model can cause a crash in views with header/footer.Martin Jones2012-03-198-25/+261
| | | | | | | Geometry listeners were called for deleted header/footer. Change-Id: I47854178232f8a4ab5e19a931901b49741fec388 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Ensure section header/footer are cleaned up.Martin Jones2012-03-192-4/+25
| | | | | | | | If the model is cleared or replaced with an empty one, the section headers should be released. Change-Id: Ia2f070c312593743b2c5332a6c69facaf222ee6d Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Don't crash view while changing model.Martin Jones2012-03-191-1/+1
| | | | | | | | | Set model to null before adjusting view position, as changing position can trigger a refill() if the view is animating at that instance. Change-Id: I4bc20766b1ab906799213b149c84a1bdb268c200 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix QQuickCanvas test failure.Andrew den Exter2012-03-191-1/+1
| | | | | | | | Switch to a QTRY_COMPARE to allow a little more time processing the event loop. Change-Id: I4f14feb5cbc7d11654f6c9089baff4ae67d894db Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix grabbing to wait until the image has actually been grabbed.Michael Brasser2012-03-191-11/+1
| | | | | Change-Id: I3535c57b5d8dd99c8a6cf24ccb1b56af298fcfe6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix bug in v4 strict equality.Michael Brasser2012-03-159-13/+201
| | | | | Change-Id: I184065e0b7c8c6536f2081b9bf03e98992a4c9fe Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Small LSB hacksHarald Fernengel2012-03-151-0/+13
| | | | | | | Enable building QtDeclarative with the LSB compiler Change-Id: I3a81247670f47db3d861910150a722bc8ac7691a Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Windows: Fix file URL issues in declarative autotestsMiikka Heikkinen2012-03-159-35/+39
| | | | | | | | | | Fixed by using testFileUrl() shared utility function where appropriate instead of testFile() or various other ways file URLs were being incorrectly used. Task-number: QTBUG-24779 Change-Id: I48cbd297d419238f42ea45132344b7e5a487b6f1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix tst_qquickimageparticle test compilation with Visual StudioMiikka Heikkinen2012-03-151-2/+3
| | | | | | | | MSVC doesn't support setenv or unsetenv functions, so use qputenv instead. Change-Id: Ife4eb056e6c87d23774512c61b13a3ae3d8ac9ce Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>