aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove now unused managed_cast template methodLars Knoll2015-04-212-23/+0
| | | | | Change-Id: Id8a5290848b65222cc9ebfe7a6d59f7994096e14 Reviewed-by: Simon Hausmann <[email protected]>
* Get rid of asFunctionObject()Lars Knoll2015-04-2125-65/+55
| | | | | Change-Id: Ib4858376dc0ec57fa473c80696abc66a570c90ec Reviewed-by: Simon Hausmann <[email protected]>
* More cleanupsLars Knoll2015-04-2171-360/+348
| | | | | | | | Get rid of Value::asObject(), and pass const Managed pointers into some more vtable methods. Change-Id: Ia4f427d5fd8868f77b4015d1ce5424d32bfc2115 Reviewed-by: Simon Hausmann <[email protected]>
* Get rid of asManaged()Lars Knoll2015-04-2113-56/+42
| | | | | Change-Id: I853417fdf1cc339f7d43a006c20e1626b6bfb288 Reviewed-by: Simon Hausmann <[email protected]>
* Get rid of asNumberObjectLars Knoll2015-04-215-12/+5
| | | | | Change-Id: Ie6355beabce3de65c215514d9dc98294b5980c9d Reviewed-by: Simon Hausmann <[email protected]>
* Stabilize QQuickWindow testSimon Hausmann2015-04-211-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Various test functions use QTest::touch* and QTest::mouse* to synthesize touch/mouse events. The synthetization relies on the QWindow to be globally positioned (with regards to the window manager), as it performs a translation of the supplied window coordinates to global coordinates. If this happens too early in the window mapping process, we end up with wrong global coordinates, that in turn mean that when the event is mapped back to the window coordinates later, it has the wrong coordinates and not what the test expects. qWaitForWindowActive tries to accommodate this case by waiting until the positioning of the window is "complete", as opposed to qWaitForWindowExposed, which returns as soon as we have a rendering surface. The symptom in the CI system was that when this race condition hit, the y coordinate of events was off by 28 pixels on Ubuntu machines, which appears to be the height of the title or menu bar. Therefore this patch changes test functions that synthesize events to use qWaitForWindowActive. Change-Id: Ia8ecff517f4eefb15068ca1c342ef6666681c362 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Frederik Gladhorn <[email protected]>
* Extend blacklistSimon Hausmann2015-04-211-1/+1
| | | | | | | | stopAtBounds also fails on 64-bit machines, as seen in http://testresults.qt.io/logs/qt/qtdeclarative/aa44b0fe7e7a72ec4257b338938e1ec3b7aee1e1/windows8x86_64windows8x86_64msvc2013developer-build_release_build-examples/6da9f7a63d5f4ce18e85b7a72ff0e888f3446352/testlog.txt.gz Change-Id: If8ac78bdb3b1e66106644efc19ef8fd018aac66e Reviewed-by: Simon Hausmann <[email protected]>
* Privately export QQuickPaintedItemPrivate.Mitch Curtis2015-04-211-1/+1
| | | | | | | We need it in Qt Quick Extras 2.0. Change-Id: Ieafa4a860322615066c4569a59fa2f85c8b2f956 Reviewed-by: Alan Alpert <[email protected]>
* Skip some tests that are hanging in the CI systemSimon Hausmann2015-04-212-1/+12
| | | | | | | | | It is most unfortunate that those tests are hanging, but in order to move forward we temporarily skip them. Task-number: QTBUG-45655 Change-Id: I9fae6c21ca3b5c7eb6715d520bd58e366136ed58 Reviewed-by: Lars Knoll <[email protected]>
* TestCase: add equals() function to QuickTestImageObject.Mitch Curtis2015-04-213-0/+73
| | | | | | | | | | | | | | | | | | This allows for comparison of image objects returned from TestCase's grabImage() function using QImage's operator== function. Doing pixel by pixel image comparisons in QML is extremely slow. This functionality is useful for checking that an item was redrawn after a property change, for example. [ChangeLog][QuickTest][TestCase] Added equals() function to image object returned from TestCase's grabImage() function. Change-Id: I0ece9df6effe2b1b9d8e1ee8ac011115d9367ef2 Reviewed-by: J-P Nurmi <[email protected]> Reviewed-by: Liang Qi <[email protected]> Reviewed-by: Kai Koehne <[email protected]> Reviewed-by: Lars Knoll <[email protected]>
* Add CONSTANT to Q_PROPERTY textDocumentKari Hautamäki2015-04-211-1/+1
| | | | | | | | | Add CONSTANT keyword to Q_PROPERTY textDocument to remove warning "depends on non-NOTIFYable properties". Task-number: QTBUG-45115 Change-Id: I090870765e8b32bc1438d21d9c1b7ef942c043b5 Reviewed-by: J-P Nurmi <[email protected]>
* Get rid of asStringObject()Lars Knoll2015-04-176-16/+9
| | | | | Change-Id: Iad3afd00d2fdbd04efa4f3b841f11269ab496826 Reviewed-by: Simon Hausmann <[email protected]>
* qquickitemviewtransition_p.h: eliminate a "_p_p.h" includeJ-P Nurmi2015-04-172-1/+6
| | | | | | | | | | | | QtQuick.Controls2.StackView includes qquickitemviewtransition_p.h to run push/pop transitions from C++. Make this header include less and use forward declares to avoid including Q_AUTOTEST_EXPORT'd classes, causing a linking error on Windows. Change-Id: Ide82a66de62697d01609e5e03798b7a6a893c418 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Liang Qi <[email protected]> Reviewed-by: Elvis Teixeira
* Get rid of Value::asDateObject()Lars Knoll2015-04-1615-46/+48
| | | | | Change-Id: I71816a784b5175f600c5a870318b16c0d84c42fb Reviewed-by: Simon Hausmann <[email protected]>
* QML Engine: JSON XHR response type supportValery Kotov2015-04-168-28/+109
| | | | | | | | | | | Support for "json" response type for QQmlXMLHttpRequest was added. [ChangeLog][QtQml][QQmlXMLHttpRequest] QQmlXMLHttpRequest now supports "json" binary response type. Change-Id: I21b7659c02dfdc6b64a73e1d2003e269d90b3b23 Reviewed-by: Simon Hausmann <[email protected]>
* Further cleanupsLars Knoll2015-04-1637-122/+107
| | | | | | | | | The get and getIndexed vtable methods should take a const Managed pointer. Start cleaning up the asFoo() methods in Value and Managed by removing asArrayObject() and asErrorObject(). Change-Id: Ibd49bf20773ef84c15785b7ac37a7bc9fd4745d5 Reviewed-by: Simon Hausmann <[email protected]>
* Added a new render job stage: NoStageMiikka Heikkinen2015-04-157-21/+158
| | | | | | | | | | | | | NoStage allows scheduling jobs for immediate execution on the renderer thread. [ChangeLog][QtQuick][QQuickWindow] Added a render job stage: NoStage Task-number: QTBUG-44953 Change-Id: I918c79f1d095bc27d911a88d81376d146a04313c Reviewed-by: Gunnar Sletta <[email protected]> Reviewed-by: Venugopal Shivashankar <[email protected]> Reviewed-by: Pasi Keränen <[email protected]>
* Make sure we stop animators if they are yet to be started.Gunnar Sletta2015-04-151-3/+2
| | | | | | Change-Id: I311e66c64a79581739f80e124fd58da2aaded549 Task-number: QTBUG-45220 Reviewed-by: Michael Brasser <[email protected]>
* Stabilize tst_qquickimage::noLoadingSimon Hausmann2015-04-151-2/+3
| | | | | | | | | | | | | | | | | | | The test loads an image from a remote source and it has a QSignalSpy installed for the progressChanged(qreal) signal on the QQuickImage. The test counts the number of times the signal is emitted and expects it to hit an exact value. That seems wrong when loading an image over the network, as we have no control over in what pieces the data arrives on our end. And as it turns out, the test occasionally fails in the CI system, which is also reproducible. To stabilize the test, we now expect at least two emissions of the signal when loading from the network (0% and 100%) but there may be more (0% 10% 80% 100% for example). In addition the reload case is simplified by resetting the spy and verifying that progressChanged was not emitted at all. Change-Id: Ib2e660651d40b92eff889ebe3baabb74d6e00fb4 Reviewed-by: Liang Qi <[email protected]> Reviewed-by: Albert Astals Cid <[email protected]> Reviewed-by: Gunnar Sletta <[email protected]>
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-1353-590/+663
|\ | | | | | | | | | | | | | | Conflicts: src/quick/util/qquickpixmapcache.cpp tests/auto/quick/qquickwindow/BLACKLIST Change-Id: Ie81612f2884f8ea508c48ba2735ec54ea1c2eca5
| * Tests: Use blacklist instead of insignificant for tst_qquickanimationsCaroline Chao2015-04-102-1/+40
| | | | | | | | | | | | | | | | | | | | Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file. Blacklist the relevant tests, the tests that have been found flaky in CI. Change-Id: I4c3ce430e654886ceea8b6f714710ebe2374e4db Task-number: QTBUG-45466 Task-number: QTBUG-29062 Reviewed-by: Ulf Hermann <[email protected]>
| * Tests: Use blacklist instead of insignificant for tst_qquickflickableCaroline Chao2015-04-102-1/+19
| | | | | | | | | | | | | | | | | | | | Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file. Blacklist the relevant tests, the tests that have been found flaky or failing in CI. Change-Id: If145b9bc413e4c9dbf1c3c06c1596647c707770e Task-number: QTBUG-36804 Reviewed-by: Ulf Hermann <[email protected]>
| * Do not stall loading of local images if network is slowAlbert Astals Cid2015-04-091-10/+29
| | | | | | | | | | | | | | | | | | | | Without this patch it can happen that we're loading IMAGEREQUEST_MAX_REQUEST_COUNT http based images, if the next image to load is a local file it wouldn't be processed until one of the http ones finishes, which makes not much sense Change-Id: I515306005192a20722f0c4588a1db1241348407c Reviewed-by: Alan Alpert (Personal) <[email protected]>
| * Fix TextEdit when vertical alignment != AlignTopEskil Abrahamsen Blomfeldt2015-04-092-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the TextEdit's alignment was either AlignBottom or AlignVCenter, several things would be broken: First of all the position of all non-dirty nodes would not be updated, so if you e.g. added text to the end of the document, it would overlap with the previously added text. Also, the frame decorations were always aligned to the top, since the basePosition was not accounted for in the node for this. The fix is to translate the root node to the base position instead of baking this into the position of the text nodes. This also automatically fixes frame decorations since it's already aligned to the top of the root node. [ChangeLog][TextEdit] Fixed issues with using other vertical alignments than AlignTop. Change-Id: I11f73eab21a28658a5cbf00292fd519efd0f3e7f Task-number: QTBUG-45032 Reviewed-by: Gunnar Sletta <[email protected]>
| * Tests: Make qquickcustomparticle significant againCaroline Chao2015-04-081-3/+0
| | | | | | | | | | | | | | | | The test is passing in CI and it seems it was temporarily made insignificant in 5a4eebbc. Change-Id: Ic53d45b842c9a9c431a43cb6d5cbd3849e5729ed Reviewed-by: Simon Hausmann <[email protected]>
| * Tests: Make qquicktrailemitter significant againCaroline Chao2015-04-081-2/+0
| | | | | | | | | | | | | | | | The test is now passing in CI. Change-Id: Iad7dc46e7819ba9e9f604ed39ab9bc53f123b119 Task-number: QTBUG-33421 Reviewed-by: Alan Alpert (Personal) <[email protected]>
| * Tests: Make qqmldebugjs significant againCaroline Chao2015-04-081-2/+0
| | | | | | | | | | | | | | | | The test is now passing in CI. Change-Id: I9414e05d40fe373878afa43121fcfa7cf95fcbdf Task-number: QTBUG-28263 Reviewed-by: Ulf Hermann <[email protected]>
| * Tests: Make qquickgridview significant againCaroline Chao2015-04-081-3/+0
| | | | | | | | | | | | | | | | The qquickgridview tests are passing in CI Change-Id: Idaf5a9d9df06a28c9ff5162b7bb00e4d677c3a0b Task-number: QTBUG-33017 Reviewed-by: Frederik Gladhorn <[email protected]>
| * Tests: Make qquicktext, qquicktextedit and qquickpathview significantCaroline Chao2015-04-083-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | The tests are now passing in CI for OS X. The test qquicktextedit is also passing on win32. Make qquicktext, qquicktextedit and qquickpathview significant again. Change-Id: I778cc90aff0d1e76b66b6f8ae5150d3113e6fc68 Task-number: QTBUG-27740 Task-number: QTBUG-32540 Reviewed-by: Liang Qi <[email protected]> Reviewed-by: Friedemann Kleint <[email protected]>
| * [mips] Handle properly unaligned halfword load.Julien Brianceau2015-04-081-1/+47
| | | | | | | | | | | | | | | | | | This patch improves YarrJIT efficiency on mips platforms. Cherry-picked from qtwebkit (ea22657d17a934b04c8621dc8891a1d4d80510e3) Change-Id: I83eca9716e4d6e9e1dd4d8ceb76c3da380502ce7 Reviewed-by: Allan Sandfeld Jensen <[email protected]>
| * Remove outdated V8 profiler testUlf Hermann2015-04-085-372/+0
| | | | | | | | | | Change-Id: I296a3f94d16c4e7a6f89e566893f627c50b66ba3 Reviewed-by: Simon Hausmann <[email protected]>
| * Return the correct type from Item::mapToItem/Item::mapFromItem.Mitch Curtis2015-04-083-77/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were returning a JavaScript object with x/y/width/height properties, instead of a point/rect. This meant that the type couldn't be converted to a point/rect because we don't support duck typing, where we would deduce the type based on the properties. One example of a broken use case that this patch fixes is when QML is unable to convert the return type to a point in a property declaration: property point p: mouseArea.mapToItem(child, mouseArea.mouseX, mouseArea.mouseY) Another is using the result of the function to pass to another function: child.contains(mouseArea.mapToItem(child, mouseArea.mouseX, mouseArea.mouseY)) Change-Id: I3ce82f10175f904dd02c8af6b5e42cee14b2ebb2 Task-number: QTBUG-41452 Reviewed-by: Liang Qi <[email protected]> Reviewed-by: Simon Hausmann <[email protected]>
| * Tests: Make qquickloader tests significant againCaroline Chao2015-04-071-1/+0
| | | | | | | | | | | | | | | | The qquikcloader tests are passing in CI. Change-Id: I472e20cdeb76f867b9cb02e3bcfdc447825d4d14 Task-number: QTBUG-30721 Reviewed-by: Lars Knoll <[email protected]>
| * Improve debug formatting of QAbstractAnimationJob and related classes.Friedemann Kleint2015-04-024-3/+21
| | | | | | | | | | | | | | | | | | | | | | - Output the state. - Add output to QQuickAnimatorJob. - Add a private export to the debug operator for use by QQuickAnimatorProxyJob to format its contained job. Task-number: QTBUG-45220 Change-Id: Ic64bb5d949864de1c4fb322d53acc3e253977e5d Reviewed-by: Alan Alpert (Personal) <[email protected]>
| * Improve debug operator for QQuickItem.Friedemann Kleint2015-04-021-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new formatting helpers and output name, z only when necessary. For example, QQuickRectangle_QML_4 (this = 0xb380e0 , name= "" , parent = 0xa4a290 , geometry = QRectF(0,0 320x480) , z = 0 ) becomes: QQuickRectangle_QML_4(0xb380e0, parent=0xa4a290, geometry=0,0 320x480) Change-Id: I5d4a8cf9f435995754f875a928fa36978418e4bf Reviewed-by: Shawn Rutledge <[email protected]> Reviewed-by: Alan Alpert (Personal) <[email protected]>
| * Fix Text item linkColor updateMarko Kangas2015-04-011-1/+4
| | | | | | | | | | | | | | | | Changed linkColor to update node correctly when link color is changed. Change-Id: I056811053e2287c93ba9c0afb5ceddef939f46ce Task-number: QTBUG-45356 Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
| * Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Liang Qi2015-04-015-16/+24
| |\
| | * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-03-315-16/+24
| | |\ | | | | | | | | | | | | Change-Id: I54e66e992f5e5d441b8b5394e7a03ec5352e7bf3
| | | * Don't send deferred delete events from windowDestroyed()Andy Shaw2015-03-302-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to 657766f19b31d83f361fd3c9ad717b207e1dff8c which removed it from the destructor itself. This goes one step further and removes the calls from the windowDestroyed() calls which also sends the deferred deletes. Task-number: QTBUG-40920 Change-Id: I491b79bb600914575ba5565d2862d041726217e8 Reviewed-by: Gunnar Sletta <[email protected]>
| | | * Improved QML test robustness and logging.Jason Erb2015-03-301-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logging to quick_test_main and reordered for robustness (e.g. moved "wait for load" to before error check). Change-Id: Ifd48b5bdd1efee4301e5c4e571241762dca176ad Reviewed-by: Friedemann Kleint <[email protected]>
| | | * Always remove reply from replies when processing cancelledAlbert Astals Cid2015-03-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we if we leave the entry in replies later QQuickPixmapReader::networkRequestDone will give a potentially already deleted pointer in replies.take(reply) which will then crash when trying to post something to it Change-Id: I157a58e3ebe0a3fd6422742843eafbbdc58a7801 Reviewed-by: Alan Alpert (Personal) <[email protected]>
| | | * Blacklist QQuickWindow::testWindowVisibilityOrder for OS XFrederik Gladhorn2015-03-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The failing test is a regression introduced by 5bf9528b9164bd888e991552b66d6237e84a7ee2. Since that patch had several side effects, we will not revert it but blacklist the test function for now. Task-number: QTBUG-45318 Change-Id: I3e28a21c8b056c1c8f2fd5d6d3ffe32d5f44b0e5 Reviewed-by: Gabriel de Dietrich <[email protected]>
| * | | Android: Work around bug on Samsung Galaxy Tab 3 10.1Eskil Abrahamsen Blomfeldt2015-03-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After installing the Android 4.4.2 upgrade on Samsung Galaxy Tab 3 10.1, one of the vertex shaders in Qt Quick stopped compiling. The issue seems to be that this particular shader triggers a bug in the driver, and a simple work-around is to replace the ternary conditional operator with a simple if-statement. [ChangeLog][Android] Fixed a vertex shader compilation issue on certain OpenGL drivers. Change-Id: I2f878215a753a7e222c46c0f85a84b0bc81d523a Task-number: QTBUG-43515 Reviewed-by: Andy Nichols <[email protected]>
| * | | Add inheritance documentation markup to animator classes.Friedemann Kleint2015-03-311-0/+6
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-45220 Change-Id: Ie817275897f860b0d6c4dcac2f92a4f3469a4611 Reviewed-by: Leena Miettinen <[email protected]>
| * | Fix some qdoc warnings.Friedemann Kleint2015-03-314-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtdeclarative/src/qml/qml/qqmlinfo.cpp:46: warning: Cannot find 'qmlInfo(...)' in '\fn' QQmlInfo qmlInfo(const QObject *object) qtdeclarative/src/qml/qml/qqmlexpression.cpp:366: warning: Undocumented parameter 'column' in QQmlExpression::setSourceLocation() qtdeclarative/src/qml/doc/src/qmlfunctions.qdoc:176: warning: Undocumented parameter 'reason' in qmlRegisterExtendedUncreatableType() qtdeclarative/src/qml/doc/src/qmlfunctions.qdoc:176: warning: No such parameter 'message' in qmlRegisterExtendedUncreatableType() Change-Id: Iec801b33b11bd57abadd968a90c49f8eba1280d5 Reviewed-by: Leena Miettinen <[email protected]> Reviewed-by: Alan Alpert (Personal) <[email protected]>
| * | Honor setFocusOnTouchRelease in QQuickTextInputKai Uwe Broulik2015-03-302-9/+20
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtQuick][TextInput] SetFocusOnTouchRelease is honored Change-Id: I0c5150465effadb7b1221250875aedf16a83bb2c Reviewed-by: Richard Moe Gustavsen <[email protected]>
| * | add qt.quick.touch.target logging categoryShawn Rutledge2015-03-301-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | qt.quick.touch produces a lot of output. This instead tracks only the changes to the itemForTouchPointId hash: which touchpoints are being sent to which items. Change-Id: I5119b4716a43fb35fd6c6712bf7d4ec46d762a9f Reviewed-by: Laszlo Agocs <[email protected]>
| * | Update the shader when devicePixelRatio changesPaul Olav Tvete2015-03-271-1/+9
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-45076 Change-Id: I03de20da2e3f436339dcf48fc7d7d3d11a509577 Reviewed-by: Gunnar Sletta <[email protected]>
| * | Guard profiler service test against unusual clock behavior.Ulf Hermann2015-03-271-60/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently a monotonic timer can return the exact same timestamp multiple times in a row. In this case the events may be sorted in a different way than we expect. By scanning all events with equal timestamps for the one we're looking for, we can still keep the test useful. Change-Id: I08e1d7ed8d74359a127ac34ebc077375aa70f492 Reviewed-by: Simon Hausmann <[email protected]>
| * | QQuickWidget: expose the underlying QQuickWindowGiuseppe D'Angelo2015-03-273-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a number of APIs (such as all the scenegraph-related signals) that are currently missing from QQuickWidget. Instead of duplicating every API in QQuickWidget, simply expose the underlying offscreen QQuickWindow. Task-number: QTBUG-45260 Change-Id: I1a89fe600ce675963ea24ee6dd56d6ca4fea9cd2 Reviewed-by: Andy Shaw <[email protected]> Reviewed-by: Gunnar Sletta <[email protected]> Reviewed-by: Laszlo Agocs <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 02:35:10 +0000