aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-2137-162/+506
|\ | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickflickable_p_p.h src/quick/items/qquickpathview_p_p.h tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp Change-Id: I77664a095d8a203e07a021c9d5953e02b8b99a1e
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2028-117/+130
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/jit/qv4targetplatform_p.h src/quick/accessible/qaccessiblequickitem_p.h Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d
| | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-200-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I59deaf6ba00e3d36a53b3840fe2522d7b72576a6
| | | * QML: Only release types if they aren't referenced anymorev5.6.1-1Ulf Hermann2016-06-162-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just checking for references on m_compiledData is not enough. The actual component can also be referenced. Thus it won't be deleted on release(), but cannot be found in the type cache anymore. Task-number: QTBUG-53761 Change-Id: I8567af8e75a078598e4fed31e4717134e1332278 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 2ac19881f92c94f4e9427bd9ff513210675f259e)
| | * | Doc: Refactor cpp integration Message sampleSamuel Gaist2016-06-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since MyItem.qml is a GUI element, the example as is triggers a segfault when starting. This patch refactors the cpp code to make it a GUI application. Change-Id: I983c8c1945bd4be364c988ab9fdfa69e35e7b9de Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
| | * | qmltest::linecount - adjust text widthTimur Pocheptsov2016-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With text line width 50 'Hello world!' is split into 2 lines on OS X 10.11 and the test expectes 3 lines, let's try something less than 50 (44). Task-number: QTBUG-53778 Change-Id: Id3254e9d89e7b41498ff8735eff97f0317ae9677 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Fix reference to Windows RT which actually meant Windows Runtime.Jake Petroules2016-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I701b25bc73cf84b1daae481eebfd2dc19003ce78 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * | Fix positioning of inline images in StyledText.Michael Brasser2016-06-163-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix horizontal positioning generally, and also address RTL specifically. Change-Id: I8b75c11bc38e39da5cda302ee9b475bf0dc464e8 Task-number: QTBUG-54075 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| | * | Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-163-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I92dc562e5896b11bdeafb5d603c39cdc5053a3b2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | V4: Always set the tag when boxing a pointer in QV4::Value.Erik Verbruggen2016-06-166-73/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All setters now store tags, so no-one can play loosy-goosy with the boxed values (and accidentally forget to "tag" a value, resulting in random garbage). Change-Id: Ia0b78aa038d3ff46d5292b14bd593de310da16a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | ItemViews: Make the wording of the warning on cache properties slightly sterner.Robin Burchell2016-06-163-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have seen far too many cases of someone simply setting cacheBuffer to a massive number in an attempt to workaround a slow delegate. It should be explicit that cacheBuffer is not a solution for these problems. Change-Id: I09416d06ff7faf51a104e09ca5f6b3593ddc53c7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | highdpi manual test: include <QDebug> not qDebug.hShawn Rutledge2016-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I24b3ccd23fdb42d44978debeeec96bac179edba6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | * | Remove erronous setTextureSize() as it is already set previouslyAndy Shaw2016-06-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing problems with the FrameBuffer render target when displaying on a HiDpi display as it would end up with a size which was not accounting for the devicePixelRatio. Task-number: QTBUG-52901 Change-Id: I587e2578d670cfecb016aae92c4190a37e7412a1 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| | * | Support glyphs outside em square in distance field cacheEskil Abrahamsen Blomfeldt2016-06-151-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the distance field cache, we would assume a max height of glyphs at 64 pixels when the pixel size was 54 (em square size is 54 and then some margin). This is an arbitrary assumption which does not necessarily hold true. Indeed, some fonts would be clipped at the bottom when assuming this. [ChangeLog][QtQuick][Text] Fixed clipping of glyphs that extend beyond font's em square. Task-number: QTBUG-52389 Change-Id: I5f6c9be235d38841e40d1bd60fb380e4712dd41a Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * | Add QNX to an x86-64 gcc/g++ listJames McDonnell2016-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QNX 7.0 will support x86-64. Change-Id: I91d79f41161324fb992e17c2067e0648b476c773 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * | Make some QNX only code Dinkum specificJames McDonnell2016-06-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The undefines won't be needed for QNX 7.0 with GNU libc++. Change-Id: Ibcea09aad54a956fc056ceaac5db6a0d53cd176c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Fix build of textureprovider example with -opengl dynamicKai Koehne2016-06-132-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not link to OpenGL calls directly. Instead, use QOpenGLFunctions. Task-number: QTBUG-53841 Change-Id: Ic87bb78fede1ee9f75b81247406ad858b2bf7342 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| | * | QAccessibleQuickItem: Add Q_DECL_OVERRIDERobert Loehning2016-06-111-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes compilation with clang 3.8 Task-number: QTBUG-54009 Change-Id: Ib777bd56d187e3c94de0cda643dac47eb30d8215 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * | QML: Only release types if they aren't referenced anymoreUlf Hermann2016-06-102-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just checking for references on m_compiledData is not enough. The actual component can also be referenced. Thus it won't be deleted on release(), but cannot be found in the type cache anymore. Task-number: QTBUG-53761 Change-Id: I8567af8e75a078598e4fed31e4717134e1332278 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Blacklist qmltest::ListView::test_listInteractiveCurrentIndexEnforce()Liang Qi2016-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-54028 Change-Id: I03390ebfb99927851926c0099fb79581f7b9e7a3 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | QmlIncubator: correct documentation snippet about waiting for ReadyShawn Rutledge2016-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes more sense to process events until the incubator is Ready rather than while it's already Ready. Change-Id: If8b0c5057dd88ffdbb2dd39f53b5b9676d0b9d19 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
| * | | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-166-43/+371
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I7b0ad528da17ecdb955c2d0c792c9f113904623e
| | * | | QML: Only release types if they aren't referenced anymorev5.7.0Ulf Hermann2016-06-112-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just checking for references on m_compiledData is not enough. The actual component can also be referenced. Thus it won't be deleted on release(), but cannot be found in the type cache anymore. Task-number: QTBUG-53761 (cherry picked from commit 2ac19881f92c94f4e9427bd9ff513210675f259e) Change-Id: If254d5bca1f41ec948ec1438df0d37bf8d531bdf Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | | Mention license change in 5.7.0 changelog.Kai Koehne2016-06-081-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5619de54769468cf61b4be55ba45459921f28c4 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | * | | Add QtDeclarative Qt5.7.0 changelogv5.7.0-rc1Antti Kokko2016-05-261-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibc9b609d1ba4d949b1f41d8e5cb4e8150794b615 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | | Merge "Merge remote-tracking branch 'origin/5.6.1' into 5.7.0" into ↵Jani Heikkinen2016-05-242-2/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | refs/staging/5.7.0
| | | * \ \ Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-05-232-2/+7
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | Change-Id: I5c636ff0d203747bad88c57abec176dec34deb47
| | * | / | Fix QQuickItem change listenersJ-P Nurmi2016-05-243-39/+243
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All listeners should get invoked, even if they remove themselves while iterating the listeners. An index-based loop would skip the next listener in the list. This change replaces the QPODVector with a QVector, so we can make a cheap copy before iterating the listeners. Change-Id: I2430b3763184a40ad1c5c3a68d36fecafcadb3ee Task-number: QTBUG-53453 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * | | | QQuickTextInput: include padding when reporting anchor rectRichard Moe Gustavsen2016-06-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a padding is set on QQuickTextInput (like controls 2 does), the anchor selection handle ends up at a wrong location. So ensure that we include padding when calculating achor rect (like we do for QQuickTextInput::cursorRectangle()). Change-Id: I356d38443ad891959f3242e254e37961e4965a4c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | | Software Image Node: Do not make equality check in setTextureAndy Nichols2016-06-201-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setTexture was called on the Software image node, we were doing a check to see if the QSGTexture pointer was the same as the current texture assuming it meant that if they were the same pointer then it was in fact the same texture, and thus not dirty. This was a wrong assumption, because the texture data can be different but still use the same pointer. So the node should always respond by updating the texture when setTexture is called and mark the nodes material as dirty for the renderer. This allows canvas items to be updated at runtime with the software renderer. Change-Id: Idf504035a6aa858e865050a58460189a12e77ad4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | | | Script dependency handling cleanupSimon Hausmann2016-06-202-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for setting up CompiledData::m_dependentScripts is independent from the QML type compiler and can be moved into the type loader. This will also allow for re-use when using disk backed compilation units. Change-Id: I56ce5674c50dcca8fda294556a3fd31e073cf24d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Minor cleanup for implicit import handlingSimon Hausmann2016-06-202-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need the m_implicitImport member in the QQmlTypeData when it is used in only one function and generally a pointer into the memory pool. Change-Id: Ib3de07631a6626ba1ebdf9e6fef379af1231fd24 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Clean up pragma singleton handling in the type loaderSimon Hausmann2016-06-204-66/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the m_isSingleton boolean by checking the CompiledData::Unit::flags after the type compilation. This is more compact and makes the singleton type checks independent from the IR. Change-Id: I04189d284e6ea275ac8540918836b641914e7588 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Increase test coverage for the V4 memory managerFrank Meerkoetter2016-06-205-6/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a small test that exercises a number of code paths inside qv4mm.cpp which are normally gated via environment variables. Change-Id: Ibe959387a9b86ce68df258513446d2165fe06ee2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | fix incorrect propagation of hover events in some casesShawn Rutledge2016-06-203-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both the item itself and its descendants need to be considered together when deciding whether or not it is interested in hover events. A correction to f728a514abdf59e2ac556eef027a69d9f21db4b2. Rename it while we're at it, to make the new meaning clearer. Task-number: QTBUG-54019 Change-Id: I1fe9f4a7f71d037a542ffefd0f3aff6f52a80a40 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | | | | Clean up file/error handling in the type loaderSimon Hausmann2016-06-205-66/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fold the functionality of reading QFile contents via QQmlFile into QQmlDataBlob::Data. This reduces the dependency on QQmlFile - which is scheduled for removal - and it makes it possible in the future to avoid reading the file altogether if we have a cached compilation unit on disk. Change-Id: Ieeaf52b6fb1d25665cd3c3b196819e25aba3dd15 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Added basic support for saving compilation units to diskSimon Hausmann2016-06-179-2/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hidden behind a QML_DISK_CACHE=1 environment variable we will now attempt to save a binary representation of the type compilation for Foo.qml next to it called Foo.qmlc. Change-Id: I27e800b50cdb186669256fd277578ea1f1e70513 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Move object/binding counter code to CompilationUnitSimon Hausmann2016-06-173-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to update the counters operates entirely on data structures from CompilationUnit, so it makes sense to move it into that class. Plus - you guessed it - this will also be called when not using the type compiler in the future. Change-Id: I644b0914980b799be1020ed74d2791b127bbcf9f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Moved import cache and type resolution cache codeSimon Hausmann2016-06-175-66/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code reads mostly from QQmlTypeData internal data structures, so it's cleaner to move it there - we can remove the getters for these internal fields. And it also allows for re-use later when not using the type compiler. Change-Id: I36cfaf3f1cecd6c8b223ee08516884a07bc60d6c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Separate QQmlPropertyValidator into a standalone fileSimon Hausmann2016-06-175-665/+772
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type compiler file is getting crowded and this class is destined to be used outside of the scope of the type compiler. Change-Id: I21aff8ee64dbfeb039523518e912ef206637fb41 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Remove remaining dependency of QQmlPropertyValidator on QQmlTypeCompilerSimon Hausmann2016-06-174-148/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead we can get most of the data from QV4::CompilationUnit - which is always ready at that point in time. And errors are now returned explicitly in the API. Change-Id: I6acbeb550661f88f7fad09e97f78a1a4cbd77568 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Reduce dependency of QQmlPropertyValidator on QQmlTypeCompilerSimon Hausmann2016-06-172-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for future use beyond the type compiler when loading compilation units off disk. Change-Id: Ic1ea89518cec32b336153ecf32641fc7f8b7db0c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Minor QQmlPropertyValidator/QQmlCustomParser cleanupSimon Hausmann2016-06-173-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QQmlCustomParser already has an imports bi-pointer, so there's no need for the property validator to implement an interface anymore. Change-Id: Iabe9810ff26afdbc0c51efde3b20383c8f4f2348 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Added iterator interfaces to QV4::CompiledData::*Simon Hausmann2016-06-171-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These interfaces are required in order to be able to use the QQmlPropertyCacheCreator template. Change-Id: I371e7102aac00fd607fc6a8ad7ffc18996608758 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Convert QQmlPropertyCacheCreator to a templateSimon Hausmann2016-06-164-26/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow the use of it also against a QV4::CompilationUnit and assorted data structures loaded from the disk. Change-Id: I4f337d1fcf319e80e422448671476db907de6d9e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Move QQmlPropertyCacheCreator implementation into the header fileSimon Hausmann2016-06-162-414/+411
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the class becomes a template, it will have to live there anyway. By moving it separately now the diff of the template conversion becomes much easier to read. Change-Id: I0fbda26d908c928d96262bc55da20a36391a8092 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Separate non-generic code out of QQmlPropertyCacheCreatorSimon Hausmann2016-06-162-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some code is not suitable for a future conversion of the class to a template, which is now moved out. This includes the tr() handling as well as the instantiation context, which does not require any parameterization. Change-Id: Ib40e24ebb7166c8649ca218f02558a737d39fe53 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Remove base-class dependency of QQmlPropertyCacheCreatorSimon Hausmann2016-06-164-39/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By not depending on QQmlCompilePass the code will be re-usable also outside of the type compiler in the future. Change-Id: I55c637886cf557d6d130c4f9325d6b0790cb2806 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | Minor QQmlPropertyCacheCreator API cleanupSimon Hausmann2016-06-164-68/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of removing the QQmlTypeCompiler dependency, the property cache vector output of the creator is now passed explicitly as an out parameter to the constructor. Similarly the error handling is made explicit in the API instead of implicitly passing any generated errors to the QQmlTypeCompiler. Change-Id: Ia3013011518f59f57f2eecb526f64dec7d82cb91 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | PropertyCacheCreator traversal cleanupSimon Hausmann2016-06-164-25/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the direct linked list object traversal with iterators. This will allow for re-use of the code against the QV4::CompiledData structures when they get the same interface. Change-Id: I901fd3377ef0f0317e5d9278cface37d80f93abf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 03:27:09 +0000