aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtdeclarativev6.0.0-beta4Qt Submodule Update Bot2020-11-091-2/+2
| | | | | Change-Id: I3e9883d3c15b6c60d21a11d225ed751bf7d8837f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qquicktextinput: compile with explicit QChar(int) constructorDavid Faure2020-11-092-12/+12
| | | | | Change-Id: I78fe89cd97b462299969d57cda099ce54fa8078a Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QQuickWindow: Check if QQuickItem was not deletedBartlomiej Moskal2020-11-091-0/+8
| | | | | | | | | | | | | | Added check into deliverMatchingPointsToItem method for Android device. In QT_VERSION below 6.0.0 touchEnabled for QtQuickItems is set by default to true It causes delivering touch events to Items which are not interested In some cases it may cause a crash. For example using Material Style in Android. QQuickShaderEffectSource may be deleted and then try to handle touch Fixes: QTBUG-85379 Pick-to: 5.15 Change-Id: Ia2c4e016db57ef9c86fcc31d4cfba6154068a546 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-11-091-2/+2
| | | | | Change-Id: Ie10f22b7c9d70bd194cb72f287ec6d8d1aa7b029 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-11-081-2/+2
| | | | | Change-Id: I3450e7a7bf1418a51be6a77a21e6fcb46b1c5094 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qtdeclarative: finish fixing compilation with explicit QChar(int)David Faure2020-11-078-25/+26
| | | | | Change-Id: Idb26e2df6d4fe8940db57066a30fa8c243f6d2c9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix misuses of the implicit QChar(int) constructorDavid Faure2020-11-072-4/+5
| | | | | | | | None of these cases intended to end up calling it, which proves that making it explicit (as will soon be the case) is a good idea. Change-Id: Ie60e85b554df956fd19bf86517945feac9f44b32 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-11-071-2/+2
| | | | | Change-Id: I619d10399912e10ce5b6cd3e7f61049177de61d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qmltyperegistrar: Move JSON processing into separate classUlf Hermann2020-11-066-285/+433
| | | | | | | | qmltyperegistrar.cpp was getting unwieldy. Change-Id: I2172253d81c0fca724bb0fef4a96d50a93c47428 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* V4: Prevent heap objects from getting immediately swept by GCUlf Hermann2020-11-064-1/+111
| | | | | | | | | | | A destruction handler can cause a new object to be allocated during garbage collection. Depending on where in the heap the object ends up, it may be found during the sweep pass. As the mark pass had no chance to mark the object, we need to set the mark bit right at allocation time in this case. Change-Id: Ie43eeb548e78bd375b001b3a6bb4ef6596f91980 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-11-061-2/+2
| | | | | Change-Id: I4383fe72dc6f999c27287f9040ef0b6e4e9f78df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Stabilize tst_QQuickDropArea::containsDrag_internalShawn Rutledge2020-11-061-5/+2
| | | | | | | | | | It seems timing-sensitive; as usual when we have processEvents() and then QCOMPARE, it's often better to just use QTRY_COMPARE in case it runs slower than expected on CI VMs. Fixes: QTBUG-88206 Change-Id: Ie6916a00e16e025c32940e6bffcabd1159480c5a Reviewed-by: Liang Qi <liang.qi@qt.io>
* Clear up Canvas docs wrt the unsupported FBO render modeLaszlo Agocs2020-11-061-17/+2
| | | | | Change-Id: I32f34979a45fea6ee1dfc163fa85f340eb7ca1e3 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Promote suffixless graphics api enum values in GraphicsInfoLaszlo Agocs2020-11-062-7/+11
| | | | | | | | | Amends 23dbe3d6e0d3338812ad9f614028a6fdc5a54090. A similar change was done to QSGRendererInterface. Therefore the QML API should follow suit. Change-Id: I2f6d1aeefc17bf3b58b7683f46511d4433194e1c Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Do not assert with OpenGL in qquickcanvasitem testLaszlo Agocs2020-11-061-8/+5
| | | | | | | | | | This is due to not fixing the graphicsApi() check: OpenGL and OpenGLRhi are now the same. The condition should have been removed anyway since it makes no sense in Qt 6. Fixes: QTBUG-88208 Change-Id: I60db54121a0a74bfa3ca1650f90244f36fc7010f Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Use suffixless enum value in graphicsApi check in QQuickFboLaszlo Agocs2020-11-061-2/+1
| | | | | | | ::OpenGL and ::OpenGLRhi are the same thing now. Change-Id: Ic905eb868a7a62d32261bdc025b20e182ed6db7c Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Fix tst_QQuickText::fontSizeModeEskil Abrahamsen Blomfeldt2020-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | The test hardcodes the height of the Text element to be 35, and then it does a pre-check that this is higher than the height of the font. This is obviously a bit flaky and caused an error because the font at the given size was 35.7 and was rounded up. I did attempt to make the logic a bit more dynamic, and have the object's initial height be based on the height of the font, but other parts of the test would then fail because they depend on the size of the object. In the end, the simplest way seemed to be to just decrease the font size until it fit inside the original Text height and leave it at that. Fixes: QTBUG-88207 Change-Id: I9c327806bde8c339b299302004dfb72b34e87bcd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* CMake: Clean up logic to prepare building pure QML modulesUlf Hermann2020-11-062-9/+28
| | | | | | | | | | | | | | Make sure we don't create bogus typeinfo entries, do create a target if there are no C++ files, and do install created targets. This way we do build the qmlcachegen-created files and link them into a library which is subsequently deployed. It's not a real plugin, though, and we need to specially handle this in QML. That's material for a separate change. Change-Id: I516d4611b6041a23489ce57df38dd83114dcc5de Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* libinfix build: adjust qmldir entriesFabian Kosmale2020-11-063-3/+20
| | | | | | | Fixes: QTBUG-88209 Change-Id: Iae298355ce0b85945ea6c5c39805794f5f997845 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-11-051-2/+2
| | | | | Change-Id: I19a0d37e4f415a4207f622d14dda6e8af2c3e9cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* FunctionCallProfiler: initialize all membersVolker Hilsheimer2020-11-051-4/+3
| | | | | | | | gcc warns (and subsequently errors out) that startTime and function might be used uninitialized. Use member initialization for all members. Change-Id: I382c0f78c67fa76f9fc955691f4391a3885da455 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-11-051-0/+91
| | | | | | | | Change-Id: I5bf32a9ba9f5e3f10f23ffe78bceecdfaa23fbc2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit eaa6459984b723cb48b2617fcabab844109c16fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Better describe the Quick 3D use case in QQuickGraphicsConfigLaszlo Agocs2020-11-051-7/+13
| | | | | Change-Id: Iae4a82af31bbefbe34ceef7e68c411e67b41dcd8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-11-051-2/+2
| | | | | Change-Id: Iaf197deec4f40faaf930702e84c15d3f986a8ef2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix documentation warnings for Qt QuickTopi Reinio2020-11-0534-135/+118
| | | | | | | | | | | - Remove links to modules and examples that are not part of Qt 6. - Remove links to entities marked as \internal - Add missing enum value and QML property docs where it's trivial to do so. Task-number: QTBUG-88156 Change-Id: I10a1c7bcc5fe0e2354ea69eaf24930362edb7415 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc:: Fix documentation warnings for Qt QMLTopi Reinio2020-11-058-21/+21
| | | | | | Task-number: QTBUG-88156 Change-Id: Ic6127c6128b4c7736cb4b5ab8ce51629388b59ca Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Fix documentation warnings for QML Models and Test modulesTopi Reinio2020-11-055-7/+7
| | | | | | Fixes: QTBUG-88156 Change-Id: Ie9723f1bb612f4603d15455a0320cc01b27ff181 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix CustomAffector exampleKaj Grönholm2020-11-051-23/+2
| | | | | | | | | Don't use particle.r which doesn't exist since the CustomParticle removal. Make example a bit simpler without this. Task-number: QTBUG-88173 Change-Id: Id994a9a58796e8194fdccd63c6439d4c19681a45 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Cleanup and optimize particlesKaj Grönholm2020-11-0514-96/+44
| | | | | | | | | | | | | | | Minor improvements while going through the particles sources: - Reduce getShadowDatum() calls - Remove unused m_lastLevel, reloadColor(), m_available m_velocityFromMovement, maximumAlive, m_pending, m_lastT, m_last_last_last_emitter, modelIndex - Color4ub structs can be assigned directly - Fix pri for shaders_ng files - Other minor refactoring Task-number: QTBUG-88124 Change-Id: I5768fed9f4b6379a698849c23436fa38169833a4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* QML engine: fix conversion scores for sequences in CallOverloadedFabian Kosmale2020-11-044-0/+52
| | | | | | | | | | | | A QV4Sequence can be converted back to its underlying container; we therefore should give the conversion of QV4Sequence to container a high score if metaTypeForSequence and the target metatype agree. This has a larger effect in Qt 6 than in Qt 5, as we now can have new sequence types for any (QMeta)Container. Fixes: QTBUG-87616 Change-Id: I2bf02ebadbf9b707719d09edaf14b112eb2caf4f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-11-041-2/+2
| | | | | Change-Id: Ie4c634da771c5ead13a56b84d7ca32bf7e639217 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Adjust to QPropertyBindingPrivate not using std::function anymoreFabian Kosmale2020-11-042-9/+44
| | | | | Change-Id: Id197f3d4bf8ab60256040e0a177d5596ce78a0a8 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove some outdated comments about FontLoader.nameEskil Abrahamsen Blomfeldt2020-11-041-4/+2
| | | | | | | | | | | In 15ea475b40f6ad28d46e5cbd65a1ccc8556a53df, I made FontLoader.name readonly and got rid of the usage where it could also be used as an indirection for the font family string. But there were a couple of comments about this usage still in the documentation, so those should also be removed. Change-Id: Ibf182e1252644e155843dea8f85f4a2f7fb56297 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update MetaType things in testsDavid Skoland2020-11-045-17/+14
| | | | | | | Also fix some minute errors. Change-Id: I1815224a6efdd7e619dfe5a5911d8b1166a3b3c8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Speed up tst_QQuickListView; round coordinate displayShawn Rutledge2020-11-032-3/+15
| | | | | Change-Id: I149258c69bac867a5d031b8d460e0192762fb8a5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QmlCompiler: Use the name of a QML object as its locationUlf Hermann2020-11-031-1/+3
| | | | | | | This is in line with what the IR does. Change-Id: I9808d6e070a19e749e43c4abf612556485eb080b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Expose QQmlPlatform and QQmlApplication to QMLUlf Hermann2020-11-032-0/+5
| | | | | | | | As properties of the Qt object they need to be visible. Change-Id: Ic6357b92f4fae36240e8dbce8976eeb6f9f41bf0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
* QQuickItem: remove unnecessary friendShawn Rutledge2020-11-031-2/+1
| | | | | | | | QEventPoint knows nothing about Qt Quick. Amends a97759a336c597327cb82eebc9f45c793aec32c9. Change-Id: Ie672e0431d3280abff7c34315a2c00cb02697a61 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QmlCompiler: Allow the specification of file scope codeUlf Hermann2020-11-032-5/+12
| | | | | | | | This can contain extra includes and code that should be added before any functions. Change-Id: Ida13d38ab7198c3986e134fe6f3786acd821927f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Minor fix for \sa syntax that caused a disappeared linkEirik Aavitsland2020-11-031-1/+1
| | | | | | | qdoc would interpret the two {} expressions as just one link Change-Id: I06c5f6ebed097ffc7e93c2ebe94045a8f6a58d78 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* tst_qqmlbinding: Do not leak componentFabian Kosmale2020-11-031-1/+2
| | | | | | | Change-Id: If562268b29fae9b0e0254719ce8d4489cfab2943 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* QML: Fix typo in documentationUlf Hermann2020-11-021-1/+1
| | | | | Change-Id: I6018e1585c6f9b778d8f8559b3f1fb9486411bff Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Get rid of all instance usage of QFontDatabaseVolker Hilsheimer2020-11-024-7/+4
| | | | | | | | All QFontDatabase APIs are static, use them accordingly. Task-number: QTBUG-88114 Change-Id: Iaa6be07e47adcdb5115e475cc5228f403e9a2b27 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qqmlbinding: Avoid event loop flakyness on Ubuntu 20.04Fabian Kosmale2020-11-021-2/+1
| | | | | | | | | | | | In a glib event loop, processEvents only processes events of the highest priority. Apparently, some higher priority event can occur which prevents the delayed binding from evaluating in time. Avoid the whole issue with QTRY_VERIFY, which runs the event loop multiple times if necessary. Task-number: QTBUG-86187 Change-Id: I796a2db1d017d389f198a24eb73d15da91ef0a65 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix compiler warnings from testsVolker Hilsheimer2020-11-022-7/+7
| | | | | | | | Replace foreach with ranged for; don't name unused function parameters. Change-Id: If0d9138261567edb14b72791799c6da1b16b5a5b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: David Skoland <david.skoland@qt.io>
* Update tests to use new metaType systemDavid Skoland2020-11-0216-139/+138
| | | | | | | | Change from the QVariant enum to the QMetaType enum and prefer typeId over userType where possible Change-Id: Ic89c55978d46cc23d23b8e9c82c475c0c220fae3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QML: Allow singleton types to be extendedUlf Hermann2020-11-0210-44/+156
| | | | | | | | | It seems we never stated that singletons can not be extended in our documentation. Therefore this is technically a bug fix and doesn't need separate documentation. Change-Id: I7877289bd5a52ecf709f80ba1975137981ec65f0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QML: Allow singletons to be created with a factory functionUlf Hermann2020-11-024-14/+101
| | | | | | | | | | This is in line with what we do on qmlRegisterSingletonType(), and it allows us to return singleton objects created independently of the instantiation mechanism. Change-Id: Ia6a077f5d22241593acd8cc87b3f65ae20f95667 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
* QML: Allow namespaces as extensions to typesUlf Hermann2020-11-0210-21/+116
| | | | | | | | | | | | | | | | | This way we can access the enums of namespaces as properties of the primary type. This is achieved by: 1. Making enums of extended types available in the base type 2. Allowing the extension to be specified as plain metaObject rather than as type name. 3. Refraining from creating the extension if the create function does not exist. The goal of this is to declare the Qt namespace in a civilized way, but will also help with cleaning up the QtQuick value types and their enums. Change-Id: I13399741d30ce38d1bff753cfa1b11e72ccfbf6a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* sg docs: Add a note about direct graphics API usageLaszlo Agocs2020-11-021-0/+9
| | | | | Change-Id: I7edc83cc945a1e11d0b1197fa0b26e10b69a99c8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 17:12:16 +0000