aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-08-0646-304/+806
|\
| * Merge branch 'stable' into devSergio Ahumada2013-08-0546-304/+806
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557
| | * Fix tst_qquickpath not to use fuzzy compareRafael Roquetto2013-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On arm platforms, qreal == float. QPointF stores its coordinates internally on qreal variables (float on arm). When QPointF comparison takes place, a call to qFuzzyIsNull(float) will ultimately be triggered, causing the test to fail for some values, because the epsilon of 0.00001f is too small. In the particular case regarding BB10, the comparison between QPointF(100, 150) and QPointF(99.9999771, 150) is failing because of that. Change-Id: I53c8cfe7f8a975f6a015e7690702d3e5f05bc2f2 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Fix tst_qquicktexteditRafael Roquetto2013-08-022-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use showNormal() instead of show() to keep expected window sizes on fullscreen platforms. - Use consistent point size for hAlignVisual - Do not query for QQmlComponent::Loading on remoteCursorDelegate: when a new connection is established to the test http server, it will setup a single shot QTimer with a 500ms timeout that will trigger the reply to be sent back, making the call to sendDelayedItem() obsolete and reduntant. Also, it means that in some platforms, data will arrive back to the component before the check for QQmlComponent::Loading is executed, causing the test to fail since at this point the status will already be QQmlComponent::Ready instead. Change-Id: I6508c28fa55a1aa2ae5861922701a8c322342380 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Avoid using connect in QQuickImplicitSizeItem.Michael Brasser2013-08-011-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past connect has shown up as a noticeable cost in item creation. Avoid the use here by refactoring to call base class implementation and emit override signal as well. Task-number: QTBUG-32764 Change-Id: If3e5a1cc55c113d812705fcfdc7a17aee9d6f51c Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| | * Fix crash when changing non-cached source of image during animationMichael Brasser2013-08-013-2/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure deferred deletions are handled while syncing, otherwise texture might be deleted after sync but before deferred deletion is processed. Task-number: QTBUG-32513 Change-Id: Id276f536a5722a36baae815b7b550b574eeeb483 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * Remove comment that QQuickPaintedItem is only useful for porting.Gunnar Sletta2013-08-011-3/+0
| | | | | | | | | | | | | | | Change-Id: I5d4a7917baa7c8f8dd7cfe3f49c6cf4fe5532ac0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * Fixed distance field text getting clipped at small sizes.Yoann Lopes2013-08-011-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-32750 Change-Id: I6bdf63d3cbcaaeb54c7c1ae25dfc55fc7e964075 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * Doc: Clean up docs for PathView.highlightRangeMode enum valuesTopi Reinio2013-08-011-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PathView.NoHighlightRange description, move the enum values into a list, and do some minor editing. Task-number: QTBUG-16160 Change-Id: I5356c21ea3244ce43defa346da11696a8706c71f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Rectangle which only draw an opaque border should not be blended.Gunnar Sletta2013-08-011-1/+1
| | | | | | | | | | | | | | | Change-Id: I55996a1c38ad6da4566d2160155503a27ad4a20b Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * Stabilize tst_qquickitem.Friedemann Kleint2013-07-311-85/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instantiate windows and views on the stack or add QScopedPointer. Add waitForWindowExposed() after show(). Add diagnostic message. Task-number: QTBUG-32664 Change-Id: I190f2a0490b8333a7886a23e26582c6cb615df94 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Add diagnostic output to tst_qquickpathview::cancelDrag().Friedemann Kleint2013-07-311-1/+9
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32662 Change-Id: I62b53f94659be95b3bef86f853733998d4d882dc Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Correctly update flickable visibleArea.heightRatio when geometry changesNils Jeisecke2013-07-313-5/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix the visibleArea.heightRatio and widthRatio values were only updated on geometry changes when flicking was active. So when setting the flickable geometry to the content geometry and thereby disabling flicking the ratios were not updated. This could for example cause wrong scrollbar renderings. The ratios are now also calculated directly after accessing the visibleArea property for the first time. The new autotest covers both problems. Change-Id: I54ba606524557fb328a198c312c1f65eb125c5a3 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | * QQuickListViewPrivate::updateStickySections(): add missing null checkJ-P Nurmi2013-07-291-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-32711 Change-Id: I45ed6829f2c240e8352dac33beeee803cb88a18d Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | * Fix tst_QQuickDrag::recursion()Rafael Roquetto2013-07-291-3/+43
| | | | | | | | | | | | | | | | | | | | | Process events and handle number of move events correctly. Change-Id: I555582ad4e10d5c76bbdc8ce9203b8f5897d0f56 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * FolderListModel: Do not return invalid URLs like "file:" when navigating up.Friedemann Kleint2013-07-292-8/+32
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32139 Change-Id: I715b97eb85bc4235de6a2bb696131efae56477fd Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * FolderListModel: Fix setting of directory in componentComplete().Friedemann Kleint2013-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Discovered when fixing Task-number: QTBUG-32139 Change-Id: I94d1a958069666ed43db146a7393e5f1ff4e177e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-2620-116/+313
| | |\ | | | | | | | | | | | | Change-Id: Ibb0e597c0cd02732bae3ef0ccc31c3ef36c75584
| | | * Workaround for distance field glyph upload problem.Yoann Lopes2013-07-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems uploading an image (into a texture) which has padding at the end of each scanLine and alpha-only pixel format is broken with some OpenGL ES drivers. The workaround is to upload one line at a time. Task-number: QTBUG-30908 Change-Id: Ic680654951b6aec294c1a173708c1fb75e57ff8f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | | * Doc: Update Tweet Search Demo to use Twitter Search API v1.1Topi Reinio2013-07-266-53/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twitter REST API v1 is no longer supported. This change updates the Tweet Search Demo to use the new version (v1.1). Specifically, - Use of OAuth tokens (authentication required in v1.1) - JSON parsing for results instead of XML - Use of url/hashtag/username entities returned in search results Also, update the documentation to discuss authentication and registering the application to dev.twitter.com. Task-number: QTBUG-31745 Change-Id: I00cd7b07f065babb03483daabe8df22f22995c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | | * Stabilize text tests that grab windows.Friedemann Kleint2013-07-254-39/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add window flags to make sure window stays on top to tst_qquicktext::hAlignImplicitWidth() and tst_qquicktextedit::hAlignVisual(). Add diagnostic output. Determine the section size by checking the font size. Add more characters to line 2 to make it more discriminative. Task-number: QTBUG-32540 Change-Id: I19a74a775bf2663027ec211784870fd9f6547b48 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | | * Keep the QML ColorDialog's controls in sync with the color propertyShawn Rutledge2013-07-252-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the user could change the color by dragging the crosshairs or the sliders, but if the application set the color property, it did not programmatically move the crosshairs and sliders. Task-number: QTBUG-32545 Change-Id: Idd54e711400dfd78d570161297559f9521c1d67f Reviewed-by: Liang Qi <liang.qi@digia.com>
| | | * Correct initial/minimum size of default QML ColorDialogShawn Rutledge2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd53d9c7246b17a9159faec06a7ce6c6355cd09f Task-number: QTBUG-32572 Reviewed-by: Liang Qi <liang.qi@digia.com>
| | | * Doc: Link to QML Qt object in relevant locationsTopi Reinio2013-07-252-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no obvious path to find the reference for QML Qt object. This change adds links to it in Qt QML module index page and QML Basic Types documentation. Task-number: QTBUG-31921 Change-Id: I8a4ef1b3e696a0a7dec416d759ae64110e59c6c0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | | * Doc: Modified the term for the Qt global object.Jerome Pasion2013-07-252-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtQml::Qt is a "QML global object" to differentiate it from the Qt namespace. "QML Qt object" "QML Qt global object" "Qt global object" (in the context of QML-only pages) Change-Id: I1d2896ad48e8432c5eb8b18f05af247986bff336 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | | * Link between "QML Basic Type: date" and QML Date object documentation.Mitch Curtis2013-07-233-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic date type seems useless if you don't know it can be used as as JavaScript date (with QML extensions). Task-number: QTBUG-32492 Change-Id: I14962f4e57522f5515f0e78d484aa59fcd9dff3c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * | test: Remove insignificant mark from tst_touchmouseSergio Ahumada2013-07-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests are passing nowaways on OS X. Task-number: QTBUG-27890 Change-Id: I2245801a44b9b6fd8773c91e2d5dd67f5a5b7373 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * | test: Remove insignificant mark from tst_qquickgridviewSergio Ahumada2013-07-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests are passing nowaways on OS X. Task-number: QTBUG-27890 Change-Id: Iddceb2f0641115f03e5116c38e95ae5772938248 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * | Fix tst_qquicktextinput::remoteCursorDelegateRafael Roquetto2013-07-261-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not query for QQmlComponent::Loading on remoteCursorDelegate: when a new connection is established to the test http server, it will setup a single shot QTimer with a 500ms timeout that will trigger the reply to be sent back, making the call to sendDelayedItem() obsolete and reduntant. Also, it means that in some platforms, data will arrive back to the component before the check for QQmlComponent::Loading is executed, causing the test to fail since at this point the status will already be QQmlComponent::Ready instead. Change-Id: I30adeed2a669d5f6618f56d8a023fe7eaea16bc0 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | Fix tst_qquickwindow for fullscreen platformsRafael Roquetto2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I040282f1bf1a2a8f212b9c7192a5ffaa2dbfdfb8 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | Fix tst_rendernode for fullscreen platformsRafael Roquetto2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib82aef04b7748ecdf148c3d9ec60ad15b3dfd7cb Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | Fix tst_qquicktextinput for fullscreen platformsRafael Roquetto2013-07-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42683f69a439608f778fbccf90573173bbc03f5b Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | Always use QDir::exists() for checking if something existsAndy Shaw2013-07-251-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a custom file engine in use by the application then it will not be able to tell if the file exists if the system stat() call is used. Therefore we let it use QDir::exists() on all platforms to ensure that this is taken care of. Change-Id: I0c93cfdad1e71b40512bcf1766de6a705a76bd9c Reviewed-by: Marcus Tillmanns <maddimax@gmail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | * | Resizing items out of the list viewport should not change the viewportAlbert Astals Cid2013-07-243-4/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the old geometry, not the new one to check if an item was outside the viewport or not Change-Id: I108412d560faf86130044f3d091254c07af0c004 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| | |/ | | | | | | | | | | | | Change-Id: I8090b927f43ed154400ce56e1118dbe8a092bfb7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative ↵Simon Hausmann2013-08-06699-29771/+127853
|\ \ \ | | | | | | | | | | | | | | | | | | | | into dev Change-Id: I278524d0f43d2237201d9cf78c1c36a5ecc83d84
| * | | Fix some GC related tests to work with MSVCSimon Hausmann2013-08-062-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using alloca instead of memset we can convince even MSVC to allocate memory on the stack, to overwrite any previous dead V4 pointers. Change-Id: Ic01bebfc6368e9c3ce1f6155a0f0ea206b90764c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Skip the date time conversion tests on WindowsSimon Hausmann2013-08-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's an issue in QDateTime, now that we're using that in our ECMAScript date implementation... Change-Id: I7599900a670097623d1b7e5b9bb086ef43d6e7e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Disable some GC sensitive tests with MSVCSimon Hausmann2013-08-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't get these tests to work reliably with MSVC because it depends on how MSVC optimizes away memory stores that are "dead" stores for the compiler but not for our conservative collector. Change-Id: Ia5ca197573a09358c220d926deccaaf0bacc3a0b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Fix integer preserving arithmetics with the interpreterSimon Hausmann2013-08-053-20/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes qqmllanguage and some other auto-tests with the interpreter When adding numbers, make sure to preserve them as integer if left and right hand side are integers. We do this now consistently throughout the runtime by providing fallback implementations of mul/sub/add_int32. Change-Id: I37e24ce14dc676bb072571b57289965ec59999c1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Fix line number resolution with the interpreter and try {} catch {}Simon Hausmann2013-08-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When re-entering the interpreter for a try block, we use a different code pointer and therefore need to set context->interpreterInstructionPointer accordingly. We do that now at the beginning of run(), before we start interpreting the instructions. When returning from a try block, we continue using the old "code" pointer and therefore need to set context->interpreterInstructionPointer back. Change-Id: I607aef104d5f74bb0c44c6635619c99a6b397bce Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Optimize lookups in the property cacheLars Knoll2013-08-051-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I0df182a18ab35ad8744fd23243286c7c501cd4a9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | Fix stack traces into interpreter codeSimon Hausmann2013-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to initialize the interpreter instruction pointer pointer before executing byte code. Change-Id: I57115699923eeeea627d83536b464f29926d443c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Fix race condition in tst_QQuickFolderListModel::basicPropertiesSimon Hausmann2013-08-051-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FLM updates its contents asynchronously using a thread, so before we query for the new properties after changing the folder, make sure the thread finished updating. Change-Id: Icbd72801f639f9dffdc0dd85fbbd8b3ee53fedda Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Prospective iOS build fixSimon Hausmann2013-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason no Makefile is created for this .pro file. TEMPLATE = app should be the default, but OTOH it's missing here. Change-Id: I499d13368944e552ee85a0c6f194c09e4c19bf8e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | MacOS: get instruction stream after closing buffer.Erik Verbruggen2013-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the QByteArray's constData might have been relocated, and the output might be anything but correct (e.g. empty). Change-Id: I2eb1223d2e0577f41c8f9e6ce81cb65af05166da Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Added convertUInt32ToDouble for X86(_64)Erik Verbruggen2013-07-303-0/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie6c918730d0ece0e9e63254ae97c257ee013f2f4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | Disable the JIT on Windows 64-bit again until the exception support is ↵Simon Hausmann2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implemented Use the interpreter in the meantime, so that we get sensible test results in the CI system Change-Id: Ib8089836b705433cd15e037d4d2dd662648c941f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | | Improve reliability of GC related testsSimon Hausmann2013-07-297-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes propertyVarCircular2 in clang release builds for example. Some of the QML/GC related tests had functions like function deassign() { someVariableThatWasholdingSomethingThatShouldBeCollectedNow = null; gc(); } which work fine with an exact GC like in v8, but with our conservative collector they are not that reliable and much more vulnerable to a reference to the object still being around somewhere. So to improve the reliability of the test, this patch moves the gc() calls out of the JavaScript function and back to the C++ caller side (these functions are invoked via QMetaObject::invokeMethod), where the existing gc() helper function will call the collector and also process posted deferred deletion events for QObjects. Change-Id: I8c1f715d56d66bc567ea8bd1575f171460b15ac8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | Silence qqmlecmascript::propertyVarInheritance failures with clang release ↵Simon Hausmann2013-07-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builds There's no equivalent to #pragma GCC optimize ("O0") yet, so we cannot run these test (sort of) reliably with clang. Change-Id: Ie41d3ba7911cefacca00165941761b20579107a2 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 09:03:08 +0000