aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Doc: Corrected display qml code in photosurface.qdocNico Vertriest2016-01-261-2/+4
| | | | | | | | | | | | | | | | | | Change-Id: Ic4e0dcc6bd91921cfea68e0cfe805e8369f58618 Task-number: QTBUG-49810 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| * | QQuickTextNode: Nuke some dead code.Robin Burchell2016-01-261-118/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been commented out since the initial introduction in 2011. I doubt it's actually useful anymore, and if it is, it's in git history regardless. Change-Id: Ife36f423a21d4b12ebca154b4ad14848844e4eef Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Fix don't delete singletons objects owned by C++BogDan Vatra2016-01-252-1/+21
| |/ | | | | | | | | | | | | | | | | | | Don't delete singletons objects that are created only from C++ and have explicitSetObjectOwnership flag set, explicitSetObjectOwnership flag is set only by QQmlEngine::setObjectOwnership. Task-number: QTBUG-49865 Change-Id: I0ef658c2094e67b5cd9a1585e273144dfcee736a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Pass Qt.include() URLs through the URL interceptor if presentKevin Krammer2016-01-238-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | JavaScript files loaded by the Qt.include() function did not get passed through the QQmlEngine's URL interceptor, while those loaded by import statements did. Now both include variants have the resolved URL passed through the interceptor, e.g. an installed QQmlFileSelector Task-number: QTBUG-50483 Change-Id: Ife75e6b644687f3fb04048a311e570cdcbab8c6d Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Make sure we destroy all QV4::QObjectWrapper objectsJian Liang2016-01-225-7/+44
| | | | | | | | | | | | | | | | | | | | Delay freeing QObjectWrapper Value to MemoryManager::sweep() to make sure we can destroy all QObjectWrapper objects. We also keep track of QObjectWrapper in QV4::Heap::ModelObject to make sure we destory them in QV4::MemoryManager::sweep() Change-Id: I3a8a3b07faab1f88c2eb746f68aa8d9584b40026 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Doc: corrected some minor link issuesNico Vertriest2016-01-222-3/+3
| | | | | | | | | | | | Change-Id: I6bdd485eafe2c2a0c925690dab451664af1223dc Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * tst_qquicklistview: Move a number of window instances to use scoped pointers.Robin Burchell2016-01-221-227/+115
| | | | | | | | | | | | | | | | | | These are exception safe (not that that matters greatly here) but more importantly idiot-proof. A number of tests weren't cleaning up windows properly before. Change-Id: Ieca676c8eea54d3c2a1d9e4738133acdb2b370fe Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | QTextEdit/QQuickTextEdit undo issue - Part #1Dan Cape2016-01-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change to the qquicktextedit testcase will match updated functionality for undo (made in qtbase) in the following scenario: If a user selected the text "foo" and typed "bar", upon pressing undo, the text would change to "b". This is incorrect and does not match the functionality of QTextEdit or the default behaviours of Windows/OSX/Ubuntu. When pressing undo on QTextEdit, the text would change back to "foo". The changes to the testcase is basically removing one step in the undo test data that does not happen anymore. Since the change to undo was made in qtbase, I need to disable the undo test cases using the BLACKLIST until the qtbase change is in. Then there will be another review to re-enable it. Task-number: QTBUG-38825 Change-Id: I60e799d546945aac89634b49b2e1dc60a2a68935 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Remove insignificant flag from scenegraph testTony Sarajärvi2016-01-271-1/+1
| | | | | | | | | | | | Change-Id: Ied9ec851a8a3eee6b0bea0433e79d06e1cc2d15e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Remove some dead code.Ulf Hermann2016-01-222-8/+0
| | | | | | | | | | Change-Id: I511252cee0b6420670af839796b2e35915c35e50 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/devSimon Hausmann2016-01-2229-30/+480
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-2229-30/+480
| |\| | | | | | | | | | Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
| | * Clean up QV4DataCollectorUlf Hermann2016-01-223-123/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to pass debuggers and engines around as the data collector already has all the necessary information. Also, the exception collect job is only used in the test case, so we don't need to define it in the collector. Change-Id: I3197dd5c2d99e95465aa787097c6f8bf8aee794e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * V4 Debugger: Avoid looking up values in debugger threadUlf Hermann2016-01-225-414/+434
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid interaction with the engine from the debugger thread we move the value lookup functionality into the data collector, and drop the RefHolder. Also, we define some more debugger jobs to move the work the request handlers do into the GUI thread. Task-number: QTBUG-50481 Change-Id: Ia73ebd01e715f13110ef010a766e9b0a1e202df9 Reviewed-by: Nils Jeisecke <jeisecke@saltation.de> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Simon Hausmann2016-01-216-4/+54
| | |\
| | | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-196-4/+54
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ieb48911638b5c1acdfd4dee8aa19dca9be99a1f6
| | | | * QQuickTextLine: set lineOffset to zero in ctor5.5Anton Kudryavtsev2015-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6b085157cebaf06750a30bc050b6bed0c7f6018 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | | * Fix QQmlComponent::errors() documentationMitch Curtis2015-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b65a6aea614a01e36f0fb9e93bb8a9c929ad919 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | | | * Fix link to QQmlError in QQmlComponent documentationMitch Curtis2015-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4549acabec366bb17512aad20a943b6b2f813801 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | | * docfix: Make it clearer how Context2D relates to CanvasGunnar Sletta2015-11-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id64aff29ef8bc7cbb4f7fc46b1a0d30a47585055 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | | | * MouseArea: fixed a crash in propagate()Liang Qi2015-11-263-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should not propagate without window. Task-number: QTBUG-49100 Change-Id: Ieda3a8357283f8d07d4ffc0cc62c4e15645d7e5a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | | QQuickItem: fix an infinite loop nextItemInFocusChain()Liang Qi2016-01-203-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When isTabFence is set to true and no children. Task-number: QTBUG-50516 Change-Id: I8430336fde7ab041797f8f9d9dfe5b9d56fecddd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | | qmlplugindump: avoid generating conflicting types.Marco Benelli2016-01-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlplugindump used to import QtQuick, therefore skipping all QtQuick types when dumping. Now that it imports only Qt, it is no longer the case, and all QtQuick types would be dumped in the module's qmltypes file. It can be avoided by specifyng 'QtQuick' as dependency in qmldir file or in a json file passed as -dependencies option. It seems however that people are not used to that, so in order to restore the old behavior, the QtQuick dependency is automatically added when the dependency list is empty. Change-Id: I5fb2e57893607a877d284767b3fd09159b45ff42 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| | * | | Provide access to signal parameters in SignalTransition::onTriggered.Michael Brasser2016-01-197-5/+274
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib74d3f5e9a357a86b818e27dd7249e2ecdf1e513 Task-number: QTBUG-46897 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | QmlPluginDump: use QFileInfo::exist(f) instead ofAnton Kudryavtsev2016-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... QFileInfo(f).exists(). It's faster. Change-Id: Id9dd30f5532ed73c487caffcaad3860a6475e832 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * | QSGDefaultImageNode: Only set DirtyGeometry if new texturePär-Olof Håkansson2016-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSGDefaultImageNode::preprocess() always sets the geometry to dirty even if no new texture was grabbed. Change-Id: Ifb6ce160854aa0a5b9e0f87fbf517b21e86e0ade Task-number: QTBUG-49904 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| | * | qmlplugindump test: added check.Marco Benelli2016-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a check on meta object revisions, in order to verify regressions on QTBUG-49284. Change-Id: I616875157d2b36db0a984338ba9d6a7c5a83a240 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| | * | Fix up commit 9d7b27f5bf44a46707e6d50ebf51ecf73f91dd1bSimon Hausmann2016-01-161-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That commit changed qqmljsgrammar.cpp, which turns out to be a generated file. Therefore it's important to also make the modification to the original grammar file, to ensure that future re-generations of the file contain the new code. Change-Id: Id913b29e4a70bfa0c2786073c46dcc206c28b6ee Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * | tst_qquicklistview: Share window in stickyPositioning test.Robin Burchell2016-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it has a lot of table driven tests, if we reuse the window like the other table driven tests do, the total time is a lot lower (~2 seconds lower for just this test for me). Change-Id: I01ce38442f70d592d70ba584df3e0783956ebeaf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | QQuickItemView: Take sticky header/footer into account for ↵Robin Burchell2016-01-155-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | positionViewAtIndex(). When using an overlaid header or footer, we must adjust the position we come up with by the appropriate size in order to end up at the correct place. Change-Id: I218b9aef7fdf37f56ffb63dc395f97045b55a186 Task-number: QTBUG-50097 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| | * | Doc: typo fixJoerg Bornemann2016-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida2e39f2eb1744173cd40b4a29f3304c2a2bfd6c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | Doc: Added brief statements for examples overview pageNico Vertriest2016-01-112-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-50261 Change-Id: Ie7e7ce2fdb872f1628eeb6dbcb415cecbbe92216 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | | Leave out most of tst_qqmlvaluetypes::locale() on QT_NO_IMUlf Hermann2016-01-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot get an input method from QQmlGuiProvider then. Change-Id: I8d9c2323b8a18a00bc44fc0121ddefb90253228a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | Don't build qmldebug or qmlprofiler on -no-qml-debugUlf Hermann2016-01-222-2/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | qmlprofiler depends on qmldebug and won't work with that version of Qt anyway. Change-Id: I86a180671b8d7c84e9ab05ff1cef4e6a5ea4f7f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Clean up QV4DataCollectorUlf Hermann2016-01-215-45/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to pass engines around as the data collector already has all the necessary information. Also, the exception collect job is only used in the test case, so we don't need to define it in the collector. Change-Id: I9e9f092a10295e3dc970f7b5f440e8f242ea1d54 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | V4 Debugger: Avoid looking up values in debugger threadUlf Hermann2016-01-217-329/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid interaction with the engine from the debugger thread we move the value lookup functionality into the data collector, and drop the RefHolder. Also, we define some more debugger jobs to move the work the request handlers do into the GUI thread. Task-number: QTBUG-50481 Change-Id: Id93548dc65133246deac71f73188c715e9dc01e4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Add selector() to get underlying FileSelectorAndré Klitzing2016-01-212-0/+11
| | | | | | | | | | | | | | | | | | Change-Id: If33a23e7ba06523e964d8299365f43e8125c1619 Task-number: QTBUG-45983 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-20771-13088/+9942
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Fixed qtdeclarative tests to pass with updated license headerJani Heikkinen2016-01-206-42/+42
| | | | | | | | | | | | | | | Change-Id: I3c826a7b3ee9ff66fac89a7a3d6f0e7057f03eed Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-2044-728/+1476
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I09ba19590e9425d5116a6c27cbc183debb485dde Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Remove a case of type-punning.Erik Verbruggen2016-01-201-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | This is officially undefined behavior. Change-Id: I74d7d7d6cf6a774bc6f90c5a0362ce5ba07768f8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | V4: Tweak "enable JIT" ifdefs.Erik Verbruggen2016-01-203-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - indentation, to make it readable - on arm64: only enable for Linux (but only after future testing!) - add CONFIG+=force-compile-jit handling so the JIT can be compiled/used even on platforms that don't officially support it (like iOS, where it works if you run from Xcode). This is done for debugging purposes. Change-Id: I8611ba409e10305f480463a16d88bc854b1c218a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | V4: Rename StackFrameRegister to FramePointerRegister.Erik Verbruggen2016-01-194-27/+27
| | | | | | | | | | | | | | | | | | | | | Because that's what CPU documentation calls it. Change-Id: I36efd9f424f9b4f4a8b7cbc65a2e63c67be80b95 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-19926-12978/+19649
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Ic36f1a0a1436fe6ac6eeca8c2375a79857e9cb12 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | V4: add Aarch64/ARM64 support.Erik Verbruggen2016-01-1919-15/+9421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the JavaScriptCore assembler rev. 195098. It is tested on iOS (for which it is disabled, as it only allows marking pages as executable when running from Xcode). Testing on Linux will be done when hardware arrives. Change-Id: I650e15fec03c27d4b326a2d70863a89b85cfc5c3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | QQuickTextEdit: added clear() methodLiang Qi2016-01-196-0/+98
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50428 Change-Id: Id618616f8d8d50c2a2eba79a2bf6969662e727b8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | QQuickTextInput: added clear() methodLiang Qi2016-01-194-0/+82
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-50428 Change-Id: I394c2cf1bc397dcbf6d82d3211a6b39519d7582b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | Quick: fix expensive iteration over QHash::keys() and QMap::keys()Anton Kudryavtsev2016-01-184-10/+16
| | | | | | | | | | | | | | | Change-Id: I21c48214bfddde01f71710705fe01418818a6581 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Particles: fix expensive iteration over QHash::keys()Anton Kudryavtsev2016-01-182-5/+9
| | | | | | | | | | | | | | | Change-Id: I02755796e3a5c5a3bb39e125a45d968a750e58e1 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Qml: fix expensive iteration over QHash::keys() and QMap::keys()Anton Kudryavtsev2016-01-183-14/+10
| | | | | | | | | | | | | | | Change-Id: I7bb5dd3b49b9f3a638f81156a02d999dbbd932f3 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 02:01:06 +0000