aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prospective fix for flakey "network" related QML testsv5.4.2Simon Hausmann2015-04-2543-267/+363
| | | | | | | Replace hard-coded server ports with dynamically allocated ports. Change-Id: Iab8f9a88343a9f2c49af3cd700c954c13c3bf121 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Add list of changes for 5.4.2 relative to 5.4.1Shawn Rutledge2015-04-241-0/+49
| | | | | Change-Id: I9f64f0ff3d10ced8ddc7a4aafac1c77680e3f30e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Protect the RegExp against early garbage collectionAlbert Astals Cid2015-04-141-1/+1
| | | | | | | Backported from Qt 5.5 Change-Id: Ice9fd8061fac0c35d787e1603873c69f8ef7e10b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Use qt_subtract_from_timeout instead of duplicating qt_timeout_valueDaniel Teske2015-04-1414-40/+16
| | | | | | | | The same function was duplicated 5 times in qtbase, so create one copy to rule them all and use it also in QtDeclarative. Change-Id: I4e39a7ee0541ce4fe9710cea344e537ee011bbe9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* V4 JIT: fix typo in Binop::int32BinopJulien Brianceau2015-04-141-2/+2
| | | | | Change-Id: I68f073ab512b482c9b3b1ad7860f4c759245298e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* tst_qquickapplication: change test case 'state' to be more stableRichard Moe Gustavsen2015-04-081-8/+7
| | | | | | | | | | | | | | Qt-5.4 integration can sometimes fail on this test. We have not succeeded reproducing it, but from reading the test code, it seems likely that the problem might come from already pending state events queued before the test starts. Since the test cannot know if the platform will queue state events while spinning the event loop (waitForEvents), this patch will instead only flush already queued events, which should be less prone to side effects. Change-Id: I134f98ba35faa4d9213ee658ebcbe76b390b5516 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* [mips] Fix or32 implementation in macro assembler.Julien Brianceau2015-04-071-1/+3
| | | | | | | Cherry-picked from qtwebkit (0546c8656a3728bf4375da39027e096beba4f111) Change-Id: I924661dc51bee334c6f26557e765a3a1e8ec0bce Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* [mips] Fix branchTruncateDoubleToUint32 implementation in macro assembler.Julien Brianceau2015-04-071-1/+1
| | | | | | | Cherry-picked from qtwebkit (2d9ed318a21f6102dddc0b91de2698908a9b8efc) Change-Id: I88d961e89d046b20329bc1fcfc10bfceb21d737b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add note clarifying return value of Qt.openUrlExternally()Aaron McCarthy2015-04-021-2/+9
| | | | | | | | | | | On some platforms (notably wayland and xcb) the Qt.openUrlExternally() call returns as soon as the request is passed to the underlying system. The call may still fail, but this status is not reported to the application. Change-Id: I66936440f162154f08ab5abcf5b449844930a81b Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Avoid parallel reading/writing of RegExpJitTables.hKai Koehne2015-04-011-1/+14
| | | | | | | | | | | | RegExpJitTables.h is created in the build directory at compilation time. This creates problems if debug and release targets are built in parallel: They might overwrite each other's results, letting the compiler see intermediate content. Avoid this by using separate directories for the debug and release build. Change-Id: I54fee7cb727a1c1777af8e0d5d19a71fdc3aac68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* 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 <gunnar@sletta.org>
* 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 <Friedemann.Kleint@theqtcompany.com>
* 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) <416365416c@gmail.com>
* 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 <gabriel.dedietrich@theqtcompany.com>
* Add test data for tst_GuiAppLauncherSergio Ahumada2015-03-072-0/+61
| | | | | | Change-Id: I6a93f19850325379598eb57f2a9ea304cebe558f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Make sure we deref an item from its window.Gunnar Sletta2015-03-061-3/+2
| | | | | | | | | | | | | | | | | We should compare against our own window, not our parent's. The ref/deref logic for items is there to aid us with having "property var foo: Image { }" in ShaderEffects, where the property is a parentless member of a given window. The shader effect would ref all member properties which are used as samplers, giving these items the same d->window as itself. As a consequence, it is wrong to check the old parent's window when it is the item itself that knows which window it is attached to. Change-Id: Ic34354fd86b52a7334f9757bf408bef0e25ecfd5 Task-number: QTBUG-43376 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Doc: Replace qt-project.org/doc with doc.qt.ioSergio Ahumada2015-03-051-1/+1
| | | | | Change-Id: Ib693ac8d48ab943a3c26a49ab4fca91f0c5f0b0e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix thread-safety: _POSIX_THREAD_SAFE_FUNCTIONS is in <unistd.h>Thiago Macieira2015-03-051-0/+1
| | | | | | | If you don't include it, it isn't defined... Change-Id: I1a800c709d3543699131ffff13c388ba652761fc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Disable JIT on x32 ABIDmitry Shachnev2015-03-041-2/+4
| | | | | | | | | | | Linux x32 interface has a different ABI, and our JIT does not work there, so it should be disabled. See <http://en.wikipedia.org/wiki/X32_ABI>. Done-with: Adam Borowski <kilobyte@angband.pl> Change-Id: I0771e48a51f999a97b49abc01ee72621a5aaa6c3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* V4: fix ToFixed rounding for 0 fraction digits.Erik Verbruggen2015-03-032-3/+22
| | | | | | | | | (12.5).toFixed() should return 13, not 12. Task-number: QTBUG-43885 Task-number: QTBUG-44039 Change-Id: Id2b19641e8c12dd5755d8447508b74567e4a2b9b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* bic: Add 5.{3,4}.0 bic data for QtQuickWidgetsSergio Ahumada2015-03-023-3/+43036
| | | | | | | | this is a new module since Qt 5.3 Change-Id: I9d33ba8f046190f649643302ddc343cbe6e649ed Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Fix crash in overdraw and change visualizersDaiwei Li2015-02-251-2/+2
| | | | | | | | It appears to be possible for node->element()->batch to be NULL Task-number: QTBUG-43129 Change-Id: If6e4e265a02ee305bf3aa9cad387b7a73648367a Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix memory leak of QSGContext object in QSGThreadedRenderLoopjian liang2015-02-242-0/+6
| | | | | | | Add destructor for QSGThreadedRenderLoop to destory QSGContext object. Change-Id: I479947eb35a5d7888d45655a9b8e2ece5e30bc33 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* remove unnecessary LICENSE.GPLv2Jani Heikkinen2015-02-191-292/+0
| | | | | Change-Id: Iea5465791b2ac3b0303ffbae5378c43d8ae2f130 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* docs: Add a link to Drag and DropArea in MouseArea's drag sectionSérgio Martins2015-02-171-0/+2
| | | | | | | They are related subjects so deserve a mention. Change-Id: I52f338402c8568f54dfd4b91845f9fafa762ca4d Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Update url location for missing Qt logoSergio Ahumada2015-02-171-2/+2
| | | | | Change-Id: I21084651044f1db0c7863f2121431dffec8526e3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: fix exampleJoerg Bornemann2015-02-161-1/+2
| | | | | | Change-Id: I818e0a3235060fa48c61d4f21f1202d976b15d5e Task-number: QTBUG-38456 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix width/height property assignment during animations.Aaron McCarthy2015-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | During animations the behavior of anchors.fill: parent and width: parent.width height: parent.height can be different resulting in subtle UI bugs where the final value of a property is not applied because it is within epsilon of the previous value. Fixed by directly comparing the width and height instead of using operator==(QSize, QSize) which does a fuzzy comparison. Change-Id: I4288b93db2b7baacd9f71ae1932ae743a428313a Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix QML Timer running not being updated together with triggered signalTroels Nilsson2015-02-112-3/+69
| | | | | | | | | | | | | | | | | | The running property of the QML Timer should be updated at the same time as the triggered signal is emitted, otherwise code like e.g. the following: if (qmlTimer.running) { qmlTimer.stop() } doesn't work as expected. In addition if the timer is stopped or restarted between posting the QEvent_Triggered event and receiving it, the triggered event should not be emitted. This avoids the issue of stopped timers still emitting the triggered signal which can potentially cause problems in existing code. Task-number: QTBUG-44026 Change-Id: Ia14d80d152967d09adc1586467715b2e1c6662cc Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* bic: Add/Replace 5.{0,1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-02-1121-46978/+145578
| | | | | | | | | Remove the ia32 data since there are no linux x86 machines in the CI system (which makes the data useless from an automated testing point of view) and most people use x64 these days anyway. Change-Id: I6aa1106bf6406c8338e2ffcf89436338c19b1ee5 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into ↵Frederik Gladhorn2015-02-102-1/+51
|\ | | | | | | refs/staging/5.4
| * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-102-1/+51
| |\ | | | | | | | | | Change-Id: I127c746c4131fc907ea4b6713d307f12a4760666
| | * Add list of changes for 5.4.1 relative to 5.4.0v5.4.1wip/tizenSimon Hausmann2015-02-041-0/+50
| | | | | | | | | | | | | | | | | | Change-Id: I2ea7f237ffb4af6445e62178f824421104be1f1d Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * QQuickTextItem: fix crash on polishingGiuseppe D'Angelo2015-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "d->extra" pointer is lazily allocated, hence we must check if it's valid before dereferencing it. Task-number: QTBUG-44128 Change-Id: Id69c91e889193b0e9b73ed178c0ff3b13003227f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | Update C++11 warning logic from QtWebKitAllan Sandfeld Jensen2015-02-101-9/+7
|/ / | | | | | | | | | | | | | | Fixes compatibility with gcc 5.0. Change-Id: I017c6d690c1f64359c3bac6c8b6b0f5e089861eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix crash when invalidating qqmltypeloaderDaiwei Li2015-02-061-4/+7
| | | | | | | | | | | | Change-Id: I16db2ea9a6c25d26e2b803b9bb8d9ef7156e254d Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Replace blog.qt.digia.com with blog.qt.ioSergio Ahumada2015-02-061-2/+2
| | | | | | | | | | | | Change-Id: I2518576bbe2ca9f68928973ea83b9e58084b91e3 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: fix a file name of an imageLiang Qi2015-02-061-0/+0
| | | | | | | | | | Change-Id: I6c93fd9d97649eee819a48863b92bde533dabe63 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Fix regression where QQuickScreenAttached overwrites QScreen valuesAlbert Astals Cid2015-02-062-2/+10
| | | | | | | | | | | | | | | | | | | | Up to Qt 5.3 it was fine setting the orientationUpdateMask in QScreen in C++, with 5.4 that value is always discarded and overwrote with 0, this change makes it possible to still set the orientationUpdateMask value in C++ and not have it overwritten unless specifically changed from QML Change-Id: I134290ce91be8b91df4e9e8e71120753813f48d7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix crash when QQuickWindow::updatePolish() deletes QQuickItems.Gunnar Sletta2015-02-061-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an item is deleted as a result of an updatePolish() call, it will be removed from the itemsToPolish set. However, updatePolish() internally works on a copy of the itemsToPolish set because changes to the set would invalidate its iterator. Because it is a copy will still contain the deleted item. Fix this by simplifying the algorithm to instead pick items one by one from the itemsToPolish set until it is empty. The recursion guard has been increased because we're not decrementing it for every single QQuickItem::updatePolish() call. Task-number: QTBUG-42913 Change-Id: If7ab7f7616b01daf4d3ed843f927c163dfb03843 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Doc: link issues qtdeclarativeNico Vertriest2015-02-0413-42/+34
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I154ffa83512435c3e455937a3f81931a45d9e368 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | TextInput: update the baseline offset when vertical alignment changesJ-P Nurmi2015-02-031-0/+1
| | | | | | | | | | Change-Id: I2153e879c7ad8b770d5ca47dac68f994bb171b2d Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Fix Text wrapping when growing from 0 width.Michael Brasser2015-02-033-1/+28
| | | | | | | | | | | | | | | | The fix for QTBUG-30896 caused a regression in the test case. Now check both width and implicit width validity before resetting widthExceeded. Change-Id: I4aba2aad299746906cfe20e288fa60cfe2acc64f Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* | qquicktest: Wait for the view to finish loadingDaiwei Li2015-02-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | Tests can be skipped if the view is still loading by the time we get to the end of the loop. There is a case where the window is active but the QML hasn't been loaded. Change-Id: I4e8346ee547653810458d042925d673748c1fec8 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix possible crash when removing items from QQmlDelegateModelDaniel Vrátil2015-02-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When iterating over the cache in QQmlDelegateModel::_q_itemsRemoved(), removing of some of the items can trigger layout change in the view, which might in turn remove a QQmlDelegateModelItem from the cache, causing us to dereference an already deleted pointer. To prevent crash, we always check whether the item is still valid in the original cache and skip it if it has been removed in the meanwhile. Task-number: QTBUG-34351 Change-Id: Ib91a0544e11dbd7bf6d82fa4dc4400cac9d0b5f7 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Doc: Fixed a broken link about sprite sheet scriptLiang Qi2015-02-021-8/+6
| | | | | | | | | | | | Change-Id: Ia574bee49f9c509c83bf9818442fbd314a0259b7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Fix vertical positioning of the first image in TextJoni Poikelin2015-02-021-1/+1
| | | | | | | | | | | | Task-number: QTBUG-38528 Change-Id: Ie16000cf9ba20598da51683751a8fb62798a1322 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Doc: add missing "winrt" & "winphone" to Qt.platform.osJ-P Nurmi2015-02-021-0/+2
| | | | | | | | | | | | Change-Id: Idc252cc0303ffd7e8259cd9bf19a05a643657600 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Karim Pinter <karim.pinter@digia.com>
* | Doc: fix Qt.platform.os since -tagJ-P Nurmi2015-02-021-1/+1
| | | | | | | | | | Change-Id: I623ae8818d6d8f10faec2f823c4d27a37d8fecda Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Verify context creation in Quick tests.Friedemann Kleint2015-01-293-10/+24
| | | | | | | | | | | | | | | | Verify initialization steps and initialize pointers to avoid crashes. Change-Id: I2d3a53c6719727aed56e673d0d8cf5a02ae0f0f6 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>