aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix the evaluation of JS switch statements in QML bindings.Roberto Raggi2011-11-298-0/+321
| | | | | | | Task-number: QTBUG-17012 Change-Id: Ic132cf63ed08592fec9c759df1b8b4d5830acea6 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Properly protect access to pixmap reader thread with mutexChris Adams2011-11-297-12/+126
| | | | | | | | | | | | | | | | | | Previously, access to the reader thread wasn't guarded properly, causing a crash when the reader thread was deleted prior to QDeclarativePixmapData (which then attempted to dereference the thread pointer to cancel the request). This commit adds locking to ensure that access to the reader is protected properly. This commit also fixes an issue where if a QDeclarativePixmapData was deleted after its QDeclarativePixmapReply was removed from the jobs queue but prior to processing, a pointer to the data could be dereferenced as part of processing, but caching the required information in the reply. Task-number: QTBUG-22125 Change-Id: I32aa2ca41a297b48e68cb358f4aa4fafd999f215 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add a length property to TextEdit.Andrew den Exter2011-11-293-1/+31
| | | | | | | | | | This returns the length of the unformatted text in a TextEdit which should be cheaper to query than the length of the text property and meaningful in the context of the selection and cursor properties. Task-number: QTBUG-18949 Change-Id: Ia25c4553693923f97d299f1fdb8bfcf7f5937b13 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add indexed deleter to sequence wrapper, implement length setterChris Adams2011-11-296-10/+156
| | | | | | | | | | | | | | | | | | Previously, elements could not be deleted from sequences directly without reassignment. This commit adds an indexed deleter which allows elements to be deleted by specifying an index. A deleted element will be replaced with a default-constructed element in the sequence (slight departure from ECMA262r3 which specifies that it should be replaced with Undefined). This commit also implements the length property setter according to the requirements on Array [[Put]] by ECMA262r3 which allows removal of elements from a sequence (required for proper behaviour of Array.prototype methods such as splice() and pop()). Task-number: QTBUG-22808 Change-Id: I62511b3edc2ec35f92d2a2bd719278e129c98547 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update to QtQuick 2.0Alan Alpert2011-11-2936-36/+36
| | | | | | | Note that the plugin only exposes QObject types, not QDeclarativeItem. Change-Id: I817d143f762239e32456a7ac8fcca29c483a4f8e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Get the tutorial running againAlan Alpert2011-11-2912-53/+11
| | | | | | | Note that it still uses QtQuick 1.0 Change-Id: I1b6e174c2ec06ba6108f11cb295e32bc76ac3e36 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Initial window implementationAlan Alpert2011-11-2913-4/+410
| | | | | | | | | Includes adding a color property on QQuickCanvas. Note that most Window related properties come from the QWindow inheritance. Task-number: QTBUG-19799 Change-Id: I00f6c90a1e2a5c85d787793d6edac2cd7d5309ab Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove unused function magnitude()Kent Hansen2011-11-291-5/+0
| | | | | Change-Id: I58660467ed38e70606ac727f1d82177efaa19805 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix unused variable warning in QQuickItemParticle::takeKent Hansen2011-11-291-0/+1
| | | | | Change-Id: I7664fdc47e7f42f5eda1bfea09def0cb880f49da Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QDeclarativeInspectorService: Call updateStatus() in GUI thread.Aurindam Jana2011-11-282-2/+2
| | | | | Change-Id: I8eee3df9cb1b01f220827fb278d91bc3fa4332d4 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix unused variable warning in QSGContext constructorKent Hansen2011-11-281-1/+0
| | | | | Change-Id: I8b6fbc7765093e3ec98f5847d99dbb406ff71221 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Debugger: Fix compilation error with msvcKai Koehne2011-11-281-2/+1
| | | | | | | | | MSVC "cannot allocate an array of constant size 0". The argument isnt accessed anyway, so we can just pass 0 instead. Change-Id: I3d65707148f045f2ed2779604c164297830bfe87 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix test cases including headers with fixed Qt versionPekka Vuorela2011-11-283-3/+3
| | | | | | Change-Id: Id6a8e9bf732d3eab69f1ef337dde626845125507 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove unused QTBUG_21691 macrosJoona Petrell2011-11-282-8/+0
| | | | | Change-Id: I481fe67d1511d927da805e3fafe5ddd55b0ad0c7 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* QtDeclarative: Fix warnings in tests.Friedemann Kleint2011-11-2810-15/+21
| | | | | | | | | | | - Unused parameters - Missing interfaces - tst_QQuickListView: Fix call canvas->rootContext()->setContextProperty to use a QVariant (instead of implicitly converting to QObject*) which was apparently intended. Change-Id: Idc95d9408051e6f5b7005a7eccd764ac218ff867 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add a getFormattedText function to TextEdit.Andrew den Exter2011-11-283-1/+143
| | | | | | | | The same as getText except it include formatting tags if the TextEdit has a rich text format set. Change-Id: I601e8d396254ab6105aa7d105e25b14fcf69c4e5 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove obsolete include from QDeclarativePixmapCache testJason McDonald2011-11-281-3/+0
| | | | | Change-Id: I5583bb8c4f98b7e1b8a7daec7a3ab53a1d931f56 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix multiline eliding and support eliding when height is set.Martin Jones2011-11-284-89/+154
| | | | | | | Task-number: QTBUG-22920, QTBUG-22116 Change-Id: Ibe78ce1b0b438eec32955b986a8740f173cd082f Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Remove QtQuick1-specific define from declarative.proKent Hansen2011-11-281-2/+0
| | | | | | | | This only needs to be defined in qtquick1.pro; it's used in qtquick1/util/qdeclarativeview.cpp. Change-Id: I14dbf3e192218c6cc740295d4f575842de48dddc Reviewed-by: Martin Jones <martin.jones@nokia.com>
* qml debugger: Create abstraction for State managementKent Hansen2011-11-285-64/+260
| | | | | | | | | | | | | State and PropertyChanges aren't part of the core qml types. The (general-purpose) qml debugger shouldn't have to know those types; they are only relevant when QtQuick (2.0) has been imported. Introduce a delegate interface that performs State processing. Implement a delegate for QtQuick 2, and install it when the QtQuick 2 module is imported. Change-Id: I8af1157346ca9365eb0f7b99ccb71744d17fcebc Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* qdeclarativedebugclient: Fix flaky autotestKent Hansen2011-11-281-1/+1
| | | | | | | | | The connectToHost() call can try to establish the connection directly (synchronously), in which case the warning message will be output before the subsequent ignoreMessage() call, causing the test to fail. Change-Id: I08a6a7d4d090cbb942c348e0787b586c71318f99 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Explain the implications of QML versions a little moreAlan Alpert2011-11-281-2/+5
| | | | | Change-Id: I2b1667333a18daebba5224e210f219721096bc91 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Removed ShaderEffectItem and qt_ModelViewProjectionMatrix.Kim Motoyoshi Kalland2011-11-284-26/+0
| | | | | | | | | | ShaderEffectItem was replaced by ShaderEffect, and qt_ModelViewProjectionMatrix with qt_Matrix a while ago. The old names were kept working for a transition period, but it's now time to remove them completely. Change-Id: Ife030d2122250784fe2ec80b1f8645301b0165d0 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Better falling bear spriteAlan Alpert2011-11-282-1/+1
| | | | | | | He looked too comfortable. Change-Id: I8de05188587c53b18639cd2dc2a011db193b7790 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* qmltestrunner reports wrong LOC for failed test casesCharles Yin2011-11-281-4/+4
| | | | | | | | | The callerFile() and callerLine() calls GetFrame() with incorrect index, the right index should be the current frame index + 1. Task-number:QTBUG-22887 Change-Id: I694073b80853bf66e02414a158c8e155f8be8390 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Rewrite Connections signal handlers at compile time.Michael Brasser2011-11-287-5/+38
| | | | | | Task-number: QTBUG-22726 Change-Id: I039d54661bbf7d44912c894bf0cc1d70023a9187 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* DeclarativeDebugServices: Cleanup CodeAurindam Jana2011-11-257-60/+21
| | | | | | | | Removed addEngine and removeEngine methods from services that do not use the functions of QDeclarativeEngine. Change-Id: Id2ddcbe8cf5706d1e4ca4b59011c7e3574cfdba8 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* V8DebugService: Optimize Code.Aurindam Jana2011-11-252-265/+267
| | | | | | | Replace usage of QJSEngine with V8 APIs. Change-Id: I5221d11c1fb96a4912063d452af437a7f5bdb471 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Remove harfbuzz cruft from {declarative,qtquick1}.proKent Hansen2011-11-252-8/+0
| | | | | | | | | As of b97215b04c0bf12ecfd51ccdeaedd1fab5e8bc03 in qtbase, modules outside of qtbase can include private text headers without depending on the harfbuzz sources being present. Change-Id: Idb3d70d70c1f0f194382a405daa573e66146272a Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* QtDeclarative: Fix building of tests on Windows.Friedemann Kleint2011-11-253-4/+5
| | | | | | | Export inner classes, add missing module. Change-Id: Iabc69ac5f08b70ade994c26d36bd08359fa71137 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* QtDeclarative: Remove obsolete qmetaobjectbuilder-test.Friedemann Kleint2011-11-253-1279/+1
| | | | | | | The test now lives in qtbase. Change-Id: I50166795d8cae039272bc9448b9e1fc64248e10f Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix crash calling VisualDataGroup.setGroups during initialization.Andrew den Exter2011-11-252-2/+47
| | | | | | | | A VisualDataModel's meta type is constructed in componentComplete(), avoid accessing it before then. Change-Id: Ic9fdfa3c458d5da3014289b777f74df87aa97103 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix searchs for insert positions in QDeclarativeListCompositor.Andrew den Exter2011-11-252-3/+50
| | | | | | | | | | | | When scanning for a start range don't stop on ranges that don't have an group flags unless that range is the terminal range. This fixes a couple of issues where moving an item to the end of the list would position it after a prepend only range instead of before it, or would miscalculate the iterator offset resulting in invalid indexes in the insert range. Change-Id: Ic4aa001edf43ec86a65d432cd8f80abf0b44d276 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove ints from mouse event handling.Martin Jones2011-11-253-17/+16
| | | | | Change-Id: Icda13ae3644dc274e08e626545df75d3e561cf87 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add getText(), insert(), and remove() functions to TextEdit.Andrew den Exter2011-11-253-0/+603
| | | | | | | | | | The getText() function provides access to the plain text content of a TextEdit, and the insert() and remove() functions allow the text content to be edited inline instead of having to assign an edited string to the text property to make any change. Change-Id: Id4edf0312358e2d2db45e4c649b7bd3d22f02ffa Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Improve performance on touch event delivery.Martin Jones2011-11-246-8/+188
| | | | | | | | | | | | We continuously constructed and sorted the paint ordered items for every touch event (and paint), even though the list in most cases is identical to the childItems list, and when it is different it rarely changes. Detect when we can just use the childItems list directly, and otherwise cache the ordered items list. Change-Id: I5db0f19fc021d0c95aa6f8372ae47e6ce138d5ad Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Make the particles benchmarks compile againKent Hansen2011-11-242-2/+2
| | | | | Change-Id: Ia56fcb06ee1ef73d81288358f584cb65e3242254 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Fix style issuesKent Hansen2011-11-242-3/+3
| | | | | | | Make the Sanity Bot happy. Change-Id: Idb6d7f8c758de991c60e100b76d54ad49e16212b Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Propegate the smooth property to the textureproviderGunnar Sletta2011-11-241-0/+1
| | | | | | | Task-number: QTBUG-22880 Change-Id: I693a44e87fb87bc92e1647f6158d23986f98623a Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Added test for input method selection in TextInputPekka Vuorela2011-11-241-0/+13
| | | | | Change-Id: I4438625f9bb82e53bbdf173c9148f587984d7f81 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* QDeclarativeDebugService: Crash fixAurindam Jana2011-11-241-5/+7
| | | | | | | Query for serviceNames in registerService. Change-Id: I570bd68c424cec696ca813a7fa1b485b64e328a4 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QQuickTextInput - Remove nonexisting method from headerPekka Vuorela2011-11-241-1/+0
| | | | | | Change-Id: I48aa6efec784ea3ae937636083f6ce211521bfc6 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* TextInput elements not to have tentative commit in inputMethodQueryPekka Vuorela2011-11-244-2/+46
| | | | | | | | Tentative commit should not be part of surrounding text, it's already a property of the input method. Change-Id: I64aec9763fb20770b6729f7f59dcbe23cf5a6718 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed assert during QQuickCanvas::hideEvent().Kim Motoyoshi Kalland2011-11-242-18/+3
| | | | | | | | Also fixed a memory leak in the non-threaded renderer so that it is on par with the threaded one. Change-Id: Ie3111730a9d10085c83f7aafceda240419b722cd Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* ConsoleAPI: Use environment variableAurindam Jana2011-11-2411-69/+212
| | | | | | | | | Show detailed information, such as file and line number, for console.log, console.debug and print when the environment variable QML_CONSOLE_EXTENDED is set. Change-Id: I8f660f58d0fd08971ce9706b4a418ed60f312980 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Get rid of unused inputMethodQuery and inputMethodEvent functions in ↵Joona Petrell2011-11-244-58/+47
| | | | | | | | | | | | QQuickCanvas * in Qt5 input method events and queries are meant to be sent directly to QInputPanel::inputItem() instead of the focused QWindow * protected inputMethodEvent was actually never called by QWindow::event() like it called other specialized event functions Change-Id: I68cced106808098c320841d6a17a0cc170a8369f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move registration of QtQuick 2 types to separate classKent Hansen2011-11-244-8/+129
| | | | | | | | | Just a bit of cleanup to make QtQuick2's definition follow the convention of QtQuick1, in preparation of moving QtQuick2 to its own library. Change-Id: If9e19e5f5512f9417373bb977bcb424186554c8f Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Move QDeclarativeListModel and friends from util/ to qml/Kent Hansen2011-11-2417-25/+17
| | | | | | | | | | | QDeclarativeWorkerScript depends on QDeclarativeListModel et al, so the latter should also reside under qml/. Note that QDeclarativeOpenMetaObject also had to be moved, since QDeclarativeListModel depends on it. Change-Id: I164cba0e530d22b5771056a2acde12a18d5e83e1 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Move QDeclarativeApplication from util/ to qml/Kent Hansen2011-11-246-4/+3
| | | | | | | | QDeclarativeEngine/QV8Engine depend on QDeclarativeApplication, so this class should reside under qml/, not util/. Change-Id: I2cd49ba1170bfb610a7607525891cb80c8828f27 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Remove unused code.Martin Jones2011-11-241-31/+0
| | | | | Change-Id: Ib6ed3b9ff80593ce84930c0837201be3516b7918 Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 00:39:08 +0000