aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge master into api_changesKent Hansen2012-03-19130-2613/+3496
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qqmlenginedebugservice.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/quick/util/qquickimageprovider.cpp tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
| * 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-194-30/+42
| | | | | | | | | | | | | | | | | | 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-191-0/+4
| | | | | | | | | | | | | | | | 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-194-25/+43
| | | | | | | | | | | | | | 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-191-4/+8
| | | | | | | | | | | | | | | | 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 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-156-13/+103
| | | | | | | | | | 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>
| * Allow threaded compilation in an async LoaderMartin Jones2012-03-157-27/+132
| | | | | | | | | | | | | | Enables threaded compilation for a Loader "source". Change-Id: I2d60a3ace07aab58f3b8f069e45a2864178c959f Reviewed-by: Chris Adams <christopher.adams@nokia.com>
| * Support for multiple textures in the default distance field glyph cache.Yoann Lopes2012-03-152-51/+94
| | | | | | | | | | | | | | | | | | | | The default implementation of the distance field glyph cache can now store the glyphs of one font in several textures, allowing to cache more glyphs at once. The default maximum number of textures per cache is 3. Glyphs are recycled when all textures are full. Change-Id: I28d2d6cf5aa409141e2700b505023f15d3c2cd26 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Don't assert if focus is already clear.Alan Alpert2012-03-151-2/+6
| | | | | | | | | | | | | | | | | | Already cleared focus should exit the function without terminating the runtime. Task-number: QTBUG-24714 Change-Id: Ia8c6be0d88e43d1f71112acc7bac3eb674f22de8 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Don't leak function objects created by VisualDataModel.Andrew den Exter2012-03-153-22/+22
| | | | | | | | | | | | | | | | | | | | Function objects created from a FunctionTemplate are not short lived, and the objects created by a VisualDataModel can change between instances meaning a template is needed per instance. So use an object template as a constructor instead of a function. Change-Id: I364c6e4f714a623b7adb7475a3ee9862eeeeb119 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Set more sensible Flickable default input filtering parametersMartin Jones2012-03-151-4/+4
| | | | | | | | | | | | | | | | | | Shouldn't throw anything away by default. Also fix bug that flicking back into bounds from outside bounds halved velocity. Change-Id: I3c2d303a9e46910439dc8bfb01771376f634a684 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Fix crash caused by dereferencing collected v8 dataChris Adams2012-03-154-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a var property of a QObject is read after the v8 data associated with the qobject has been deleted but prior to the DeferredDelete event being processed, the varProperties array will be null and a crash will occur. This patch ensures that we check for this condition in both the access and set codepaths for var properties, and also ensures that an object which has previously been queued for deletion cannot be referenced in JS. Finally, it adds a unit test to ensure that we don't regress. Task-number: QTBUG-24748 Change-Id: Idde384ca01e18f4dcf9e376e9379f2c5eb410e14 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Remove binding dependency on QQmlExpressionAaron Kennedy2012-03-1523-446/+376
| | | | | | | | | | | | | | | | This is the first step to creating much lighter weight bindings that are tuned for the specific scenario in which they're used. Change-Id: Ib985dcff25679b711b5c634bbc891aa7902bf405 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Ensure that dynamic property storing QObject ptr notifies on deleteChris Adams2012-03-153-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when a QObject ptr was stored in a dynamic variant property, the value of the property could change (to a zero ptr) if the QObject was deleted without a notify signal being emitted by the QDeclarativeVMEMetaObject which stores the property. This commit ensures that such a notify signal is emitted correctly. Task-number: QTBUG-23451 Change-Id: I5689abd984b177737f8d5f18950838b73ebde328 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Let V8 throw the exception when QML property lookup failsKent Hansen2012-03-141-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only V8 knows whether a failed property lookup should actually cause a ReferenceError to be thrown. When evaluating a "typeof" expression, for example, a ReferenceError should not be thrown even if the expression involves global variables that don't exist, according to the ECMA-262 specification. QML should try to match the standard JavaScript behavior. This is achieved by simply returning an empty value handle (to signify the absence of the property), and leaving it to V8 to throw an exception as appropriate. Task-number: QTBUG-21864 Task-number: QTBUG-24448 Change-Id: I9945adcab98fc3b801371163367473d6af0ab31a Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Use the same ReferenceError message wording as V8Kent Hansen2012-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | Instead of "Can't find variable: foo", use "foo is not defined". This is in preparation of letting V8 throw the exception when a property lookup fails on the QML scope object (needed for QTBUG-24448). Change-Id: I3c747482a8ef138dad9a85530a4f6b5c4c818a03 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Don't store duplicate glyph data in a distance field node.Andrew den Exter2012-03-142-40/+31
| | | | | | | | | | | | | | | | This saves at least 16 bytes per character and removes the need to copy data between representations. Change-Id: Ia8236207bdc4ed8292f7b4c72093ee02d13c0463 Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
| * Debugger: Print informational messages via qDebugKai Koehne2012-03-144-4/+4
| | | | | | | | | | | | | | This allows users to use QT_FATAL_WARNINGS. Change-Id: I114825764c841030418c956d23575159157dfd69 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Remove all accessibility updates to allow changes in qtbase.Frederik Gladhorn2012-03-144-16/+0
| | | | | | | | | | | | | | | | In order to integrate pending api changes these are temporarily removed and will return fixed as soon as qtbase is up to date. Change-Id: I558b6049ac3342d41d67441ddfba6821fc370533 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
| * Fix AND expression in v4Luis Gabriel Lima2012-03-141-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | The type of the and expressions, e.g. (a && b), were being assigned to the type of the right hand expression (b). As reported in QTBUG-24660, this approach could lead to some unexpected behaviors. Now, when the left and right hand expressions are of different types, the responsability to deal with the and expression is delegated to v8. Task-number: QTBUG-24660 Change-Id: Ic42ebb035e62e2f197c337b2106d00453a99f04c Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Fix memory leak with the shared distance field glyph cache.Andrew den Exter2012-03-143-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new glyph node instance registers its owner element with its glyph cache which in the case of the shared distance field glyph cache connects a signal from the cache to a slot on the owner, changing the text creates a new node but destroying the old node didn't remove the connection causing them to accumulate over time. In the glyph node; unregister the owner element from the cache on destruction, and in the cache only connect an owner element the first time it is registered and keep a reference count so the items can be disconnected when registrations from all nodes have been cancelled. Change-Id: Ibf32a146e146dbbf4e0556d1bd756465bd8e45ba Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Fix wrap modes not being set.Gunnar Sletta2012-03-141-1/+1
| | | | | | | | | | Change-Id: Id75ae3f01e6ed72b4a754e05bd55d5ed73b56920 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * Remove use of redundante nullPixmap image referenceGunnar Sletta2012-03-141-3/+1
| | | | | | | | | | Change-Id: I40b82c25c813722a94d9897e1f2e1dd8a1681762 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * Support module api objects in v4.Michael Brasser2012-03-147-0/+109
| | | | | | | | | | Change-Id: I72911a2c8e0a8613e53861da7b38312e51bf57da Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * More refactoring on animation controllerCharles Yin2012-03-133-9/+42
| | | | | | | | | | | | | | | | | | Add a flag and helper functions for disabling user control in QAbstractAnimationJob class and make it synchronized with QDeclarativeAnimation class's disableUserControl flag. Change-Id: Ifa84ab0c78291941469c33f2cafe5f61ee718b2c Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-1359-1029/+1029
| | | | | | | | | | | | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I62d203f21df63a95ee236e578b10418fd9680707 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
| * Implement mouseDragCharles Yin2012-03-132-0/+23
| | | | | | | | | | | | | | | | | | Simulates the drag behavior by press-move-move-release mouse events, we need 2 move events here to trigger the drag threshold. Task-number: QTBUG-22753 Change-Id: Ic3470c061834b7410c524029d82375cba62afa36 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Send accessibility updates for the right item.Frederik Gladhorn2012-03-134-7/+7
| | | | | | | | | | | | | | | | Child 0 means the first child. The index needs to be -1 which the default ctor does. Change-Id: I71fbdf5a15dd4593178cb250f06d42f601e40d4d Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
| * Remove unused init function.Andrew den Exter2012-03-132-14/+0
| | | | | | | | | | Change-Id: Id66e177a544fd8e019bae86fff6bd04bd0497d7c Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
| * Debugger: Use QStringLiteral where appropriateKai Koehne2012-03-138-27/+27
| | | | | | | | | | Change-Id: I5c33113783834ef0c7292f5f19f12d8c68f42141 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
| * Fix crash when writing property after engine deletionChris Adams2012-03-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Previously, the engine pointer stored in a QQmlProperty could be stale due to engine deletion. This commit ensures we guard that pointer. Also reverts cbb7f8b10e99fad675839d7625d3236ed67b3e01 Task-number: QTBUG-24734 Change-Id: I5349c51fbd19fa46a8710280173c1d224358b96e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Only attempt to load QML test cases from source directory if it exists.Aaron McCarthy2012-03-131-2/+5
| | | | | | | | | | | | | | | | | | | | When running installed unit tests the QML test cases are likely not in the source directory, but in the same directory as the installed test binary. If the source directory does not exist, fall back to searching for QML test cases in the current directory. Change-Id: I231b9cd49b12d88dd6cfbcc8dfb8b6c2c69d5aad Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
| * Move binding and expression classes to separate filesAaron Kennedy2012-03-1315-869/+1333
| | | | | | | | | | Change-Id: Ia9c6996a606e140f31681ecd26d93b1b0fdedf02 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | Crash fix after QMetaType change.Jędrzej Nowacki2012-03-135-9/+22
| | | | | | | | | | | | | | | | QMetaType::UnknownType was added so we can distinguish between "void" and an unregistered type. Change-Id: If8cee21b3f84bf129343dc457d10ab31a9bfc8b8 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | Make QFastMetaBuilder generate revision 7 meta-objectsKent Hansen2012-03-136-240/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for revision <= 6 will go away in Qt5. This commit updates QFMB to match the latest format generated by moc: - Store string table as an array of QByteArrayData (literals) - Store only the meta-method name, not the full signature - Don't store parameter names as a comma-delimited string - Store explicit information about parameters (count, types, names) Since the meta-data can now hold type ids > 256, there is no need to store the names of property/parameter types at all anymore. Change-Id: I487b14d22b2a92d9e6a9aa4e348f4bab181daff4 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* | Adapt to Qt5 meta-object changesKent Hansen2012-03-1311-83/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and it now returns a QByteArray. Also, the new function QMetaMethod::isValid() should be used to determine whether a method is valid, instead of relying on signature() returning a 0 pointer. Where it makes sense, the existing code that was using signature() and parameterTypes() has been changed to use the new API QMetaMethod::name(), parameterCount(), and parameterType(int). Also, in the new meta-object revision (7), the QMetaObject stringdata member is now of type QByteArrayData*. QFastMetaBuilder will be ported to generate the new format, but for now it's sufficient to reinterpret_cast the stringdata assignment to keep it compiling. Change-Id: Ie340ef17bcebc3afa4aae6450dfe2d06e4d881a4 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* | Declare QQmlError and QQmlProperty as movable types.Andrew den Exter2012-03-132-0/+4
| | | | | | | | | | | | | | | | | | Allows QList among others to use a more optimal allocation strategy for these types. Change-Id: I0a27291cae6d79d9dfc3548da7b3d4e5bc84cce8 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* | Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-masterMatthew Vogt2012-03-1329-167/+322
|\| | | | | | | Change-Id: Iaefec13503dadfa200539b8de7a2d80fc5bb3bcf
| * testlib: Improve verbose and XPASS outputJason McDonald2012-03-131-12/+6
| | | | | | | | | | | | | | | | Call only the eight-argument version of QTestResult::compare(), as the four-argument version will soon be removed from the API. Change-Id: I9e7b95a30b01fb5e084f2954aeb380b492760484 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * ListView.contentHeight does not include header and footer item heightsMartin Jones2012-03-131-2/+3
| | | | | | | | | | | | | | Task-number: QTBUG-24664 Change-Id: I2a2fe144835e61665b8693d58ca4fb9ba506e8a8 Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Displaced items were moving unnecessarilyBea Lam2012-03-132-28/+66
| | | | | | | | | | | | | | | | | | | | | | | | They should only move if they actually change from the last set position, and not if they are simply changing from their current item position, as that is wrong during an animation. This also cleans up some code for resetting the transition data. Task-number: QTBUG-24586 Change-Id: I0a6635903975ebc40d5cf8398b943a9de92d4493 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Improve interaction of nested Flickables and PathViewMartin Jones2012-03-135-18/+43
| | | | | | | | | | | | | | | | | | Don't require a flick to come to a complete stop before allowing another flickable element to begin its gesture. Change-Id: I74c1998e01e04c70c76253cd09edc02f593123d0 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Declare change set and compositor structs as movable primative types.Andrew den Exter2012-03-132-0/+9
| | | | | | | | | | | | | | | | Allows QVector to avoid invoking contructors for these types unnecessarily. Change-Id: Icc8670e4a033c943666f907c7e1b006a3d205597 Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Change repeater item to handle model being deleted.Glenn Watson2012-03-132-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | The repeater item previously stored a raw QObject pointer in a variant. When this pointer was a dynamic list model element that was deleted, the variant would continue to hold a stale pointer. Change repeater to use a guard object to hold the model when it is a QObject. Continue to use a variant to hold models that are not based on QObject to maintain same semantics. Change-Id: Ie100947132923803263c725e86efa68206382f12 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Fix SignalSpy disconnect issueCharles Yin2012-03-131-1/+3
| | | | | | | | | | | | Task-number:QTBUG-21083 Change-Id: Ic61472d886bf7c46eb37dc44b5e5ceb401917087 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 14:48:56 +0000