aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-163-11/+22
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic3ca76460360cbab866a4e881c4848e6deeaf7d7
| * QmlPreview: Protect QQmlPreviewFileLoader::load with another mutexUlf Hermann2021-08-233-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | We can concurrently load multiple files from different threads, but the loader can only handle one such request at a time. Fixes: QTBUG-95825 Change-Id: I2b94d55f2cf0da6e84dabc47df5699cc57b903a6 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> (cherry picked from commit a068fdc0b2cf7d4223d9ad15345fe9d345875936) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-163-2/+4
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I5e0eef69a31bcfda65cf965fb4c8c330581e5168
| * V4 Debugger: Collect locals also from block scopesUlf Hermann2021-05-051-1/+2
| | | | | | | | | | | | | | | | | | Block scopes can contain "const" and "let" members. Fixes: QTBUG-92224 Change-Id: Ie13d7d573e2759c510e1ea48c6edc68a095f40a0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 051dd3178bc4c9214af60c69cecfc2c28f13174d)
| * V4 debugger: Properly count break pointsUlf Hermann2021-05-042-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | We cannot just take the number of active breakpoints as ID for the next one. It's possible to remove breakpoints after all. Fixes: QTBUG-93404 Change-Id: Icde7a8e47c740e930f2313ffd9034b00033a54aa Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 7f12cf3346d65d0bff78fff8000ed519fbb921ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-24154-3204/+3204
|/ | | | | | | | | | | This reverts commit 7b1331c789df0ac12d7cf5aa5f8967b8651a4cfa. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I47eb004523bdb3beb16e9fd51e40da6f738f9f34 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Update commercial license headersTarja Sundqvist2021-02-02154-3204/+3204
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtdeclarative. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4161 Change-Id: Ic1d011aa01b1fe7242bcbbf72d5ab454d1015cf9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Revert "QQmlPreview: remove the ignore of :/qgradient/"Giuseppe D'Angelo2020-05-201-0/+1
| | | | | | | | | | The corresponding commit in qtbase has been reverted. This reverts commit 1989323559a7bc08a469f9708c644dcad1f57600. Task-number: QTBUG-84069 Change-Id: Ie042a34ea41baf538c922ed9c7280907475f759a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix some network related deprecation warningsFabian Kosmale2020-03-161-1/+1
| | | | | Change-Id: I0e5e9e42b7c81e1fa5d6abde6bd6346dbc2f14ff Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-022-2/+2
| | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step cloaser to that goal. Change-Id: I3214ad6ccaca9dfd4a026589cabeb40cbf4a6298 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* V4 Debugger: Properly set up context object for expressionsUlf Hermann2020-02-141-4/+4
| | | | | | | | | | | We need to use the object in question as context object in order to access its properties. Otherwise we can only access the context properties and, incidentally, the root scope's properties. The latter is why the test didn't fail. Fixes: QTBUG-82150 Change-Id: I1f18f9e78dd61786310fd75e0695929522a4c90c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QmlDebug: add new debugtranslationserviceTim Jenssen2020-02-056-2/+170
| | | | | | | | | | | | Users were asking for having the possibility to see where the translated text will not fit in the reserved/available space. This is more a preparation patch to get the right connectors to change the visualization of findings or maybe log this to a file. Task-number: QDS-1463 Change-Id: Ic0a7a930141d6eeb79964e51c0a165c69888cf5d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-291-1/+4
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp Change-Id: I133bfd4bd9dd6f704252c956c90f05e8a8a40d6a
| * Merge 5.14 into 5.14.1v5.14.1Kari Oikarinen2020-01-152-8/+13
| |\ | | | | | | | | | Change-Id: Iefb900b42cc0476e62342724a5f3a480c09ce354
| * | Return false for user types in isSaveable()Andy Shaw2020-01-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling isSaveable() for a user based type then it should return false because the client will not be able to read these types. This prevents it from using the wrong streaming operator for the user types then. Change-Id: I7f3bff359dd0c3fa49dc4e83db0057b79c481ed9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Change some unite(const QHash &) to insert(const QHash &)Mårten Nordheim2020-01-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of the other code handles it like a multi hash, so let's change the calls from unite() to insert since we now have an option which won't silently create a multi hash. Change-Id: I520295bde81c4ad1b0665308fcaf5fe41c6c3039 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-202-8/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/quick/items/qquickitemview.cpp Change-Id: Ib9faebdbef5eebb80f4e6aeb5b15b5df7494b157
| * | fix for out-of-screen preview windowsUlf Hermann2020-01-142-8/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | The problem was that the screen position was changed by the user and it did not check this before it set it to that saved position. Also added a warning if it is still happening - which is not expected anymore. Fixes: QTBUG-79323 Change-Id: Id3d945626461016d51fcad9f8882c3d39544a985 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Replace QVariant::type with QVariant::userTypeOlivier Goffart2020-01-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | as type is going to be deprecated. This change was done automatically with the help of clazy. In addition, ColumnRoleMetadata was changed to take an int instead of a QVariant::Type Change-Id: Ibc02d7b52e7d931a56c19fdebc4788b5e6df2a39 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | QQmlPreview: remove the ignore of :/qgradient/Giuseppe D'Angelo2019-12-161-1/+0
| | | | | | | | | | | | | | | | | | The new gradient presets are no longer in the resources. Besides, having those presets under that path was a bug -- all Qt-related resources *must* go under :/qt-project.org/. Change-Id: Id64225b53b65d54d1272976dadc0e12529da276e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Add trace points for Qt Quick Scene GraphMilian Wolff2019-12-137-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | This adds Q_TRACE tracepoints for all places that are covered by the QML profiler's QSG integration. The big advantage over the existing framework is that these trace points can be visualized next to other system tracepoints to correlate the data better with load and resource consumption induced by other processes on the system. Change-Id: I0c5b70a0870f0b89e4533c351c099e13fd18a55f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Avoid initializing QFlags with 0 or nullptr in further casesFriedemann Kleint2019-11-251-1/+1
| | | | | | | | | | | | | | Amends 744e77b841878fb017c0f2d60607090008f28180. Change-Id: I16e37aaf503eb62f67fca0e48be4c92c4a72ae46 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Avoid initializing QFlags with 0 or nullptrAllan Sandfeld Jensen2019-11-221-2/+2
|/ | | | | | | | | It is being deprecated. Change-Id: I844bd92af85bc53a8fc0371408d05277bd49f511 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-10-105-14/+10
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp tests/auto/quick/qquickpathview/tst_qquickpathview.cpp Change-Id: I117c8d62b21800329d1035021d312d9924f83a1b
| * Fix sprites leaking textures in SW and OpenVG backendsEirik Aavitsland2019-10-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a QSGSpriteNode is initialized with a texture, it is supposed to take ownership of the texture and delete it when the node gets deleted. In the default backend, this happens automatically: The texture gets assigned to the node's QSGMaterial object, and the node has set the OwnsMaterial flag, and so the inherited QSGGeometry destructor takes care of deleting the material, which deletes the texture. However, the Software and OpenVG backends do not have material objects, so the above mechanism does not apply, and so the texture objects are leaked. Fix by deleting the texture object directly from the SoftwareSpriteNode and OpenVGSpriteNode destructors. Fixes: QTBUG-77019 Change-Id: I503d704f66593ba6a36c969db80f74f715382b6b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * OpenVG: Fix delivery of touch eventsEirik Aavitsland2019-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | By default, touch events are compressed and then delivered on window update. However, the OpenVG render loop, unlike the other backends, did not flush the queued events during rendering. Fixes: QTBUG-76526 Change-Id: Ifbcc90aa7d1942ba2104fa81eb46fdb79b593bb9 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * OpenVG: Fix emitting of sceneGraphInitialized and -InvalidatedEirik Aavitsland2019-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | These QQuickWindow signals were not emitted when using the OpenVG backed. The reason was that the OpenVG scenegraph context, unlike other backend contexts, did not signal when it was initialized and invalidated. Fixes: QTBUG-76806 Change-Id: I2299b253464b71d4ca9c54c85359c6bcb0718d43 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * OpenVG: Fix rendering of non-affine transformed rectanglesEirik Aavitsland2019-10-071-12/+5
| | | | | | | | | | | | | | | | | | | | Perspective transforms need special handling in OpenVG. However, that was only done for rounded rectangles. Enable it for zero-radius rectangles too. Fixes: QTBUG-76589 Change-Id: Ibe2e0344dfde45f70f8f443fcd22d33e89eae286 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Consistently use qint32 as IDs and counts in engine debuggerUlf Hermann2019-10-092-21/+23
| | | | | | | | | | | | | | | | | | | | We should not sent unsigned numbers and read them as signed ones. The invalid ID is -1, and it's good style to use types of fixed size for the debug protocol. Fixes: QTBUG-79114 Change-Id: Ib6754ad893cc01d3fe7aa7f76fbd732df36d969a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Small performance improvements suggested by clang-tidyAlbert Astals Cid2019-10-071-1/+1
| | | | | | | | | | | | | | | | | | mostly add const &, a few std::move and in particular case, remove const so the std::move being done over the variable actually has effect Change-Id: Id611cd31bc012f219d7a17d4626b1c2a5fbddd66 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | QQuickWindow: Don't leak the animation controllerUlf Hermann2019-10-023-4/+4
| | | | | | | | | | | | | | | | | | There are ways to close the window without hitting the code paths in the render loops that delete the animation controller. Probably if no frame was ever rendered. Change-Id: If3e9d2051525c4ff50eda19084c967578fe4f4b0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Make QQmlValueTypeFactory::valueType() and isValueType() consistentUlf Hermann2019-09-042-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If isValueType() returns true, we should really return a non-null value from valueType(). Otherwise the assumption that QQmlValueTypeWrapper::valueType is never null breaks. In particular, the unknown type and various primitive types are _not_ value types. We special case the, probably common, UnknownType and check the actual return value of valueType() for anything else. In order to avoid looking up the metaobject each time we request a type that is not a value type, we keep an invalid value type as marker for "not checked yet" and replace that with nullptr once we determine that the type in question is indeed not a value type. Fixes: QTBUG-76866 Change-Id: I797f4cdd4db48ffc1b8fa2d919afc8022f67fa94 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Remove an unused event type in the threaded render loopLaszlo Agocs2019-08-221-12/+0
| | | | | | | | | | Change-Id: I505ba09d6a0144f18bf29cda2f549c8b69ada1a5 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | Make openvg compileLaszlo Agocs2019-07-306-8/+37
| | | | | | | | | | | | | | | | | | | | The plugin is not tested in any form in CI, and some of the internal changes in the RHI patch has some consequences here as well. Adapt as necessary. Have not tested the plugin in practice but it compiles now. Change-Id: I482fa34802d0bd4d44570f852298c1227cf0bb71 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Split qqmltypeloader{_p.h|.cpp} into a several filesUlf Hermann2019-07-111-0/+2
| | | | | | | | | | | | | | No one can read this mess. Change-Id: Icec4f2afc466435c1ae5e4e80fa2c1b5baf7d087 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Fix build without features.translationTasuku Suzuki2019-07-084-0/+16
| | | | | | | | | | Change-Id: Ic97c0245f06e3181bc528dbeeaa56cc43a37e67f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Eradicate Java-style iterators and mark the module free of themMarc Mutz2019-07-041-4/+2
| | | | | | | | | | | | | | | | Java-style iterators are scheduled to be deprecated, or at the very least banned from use in Qt's own implementation. Change-Id: I6a1aeceb22dfa13c4ed7443296455b60abed7d67 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Add the graphics api independent scenegraph portLaszlo Agocs2019-07-0410-61/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opt in via environment variables: QSG_RHI=1 -> enable using QRhi instead of GL QSG_RHI_BACKEND -> set to vulkan, metal, d3d11, gl to override the default (the default is d3d11 on Windows, metal on Mac, gl elsewhere) Or force a given rhi backend via the existing QQuickWindow::setSceneGraphBackend(). Otherwise the default behavior is the same as before, the rhi code path is never active by default. -no-opengl builds are supported in the sense that they work and default to the software backend. However, the rhi code path cannot currently be used in such builds, even though QRhi from qtbase is fully functional with Vulkan, D3D, or Metal even when qtbase was configured with -no-opengl. This cannot be utilized by Quick atm due to OpenGL usage being all over the place in the sources corresponding to the default backend, and those host the rhi code path as well. This will be cleaned up hopefully in Qt 6, with the removal all direct OpenGL usage. Other env.vars.: QSG_RHI_DEBUG_LAYER=1 -> enable D3D debug or Vulkan validation layer (assuming the system is set up for this) QSG_RHI_SHADEREFFECT_DEBUG=1 -> print stuff from ShaderEffect QSG_SAMPLES=1,2,4,... -> MSAA sample count (but QSurfaceFormat works too) QT_D3D_ADAPTER_INDEX=0,1,... -> D3D adapter index QT_VK_PHYSICAL_DEVICE_INDEX=0,1,... -> Vulkan physical device index QSG_RHI_UINT32_INDEX=1 -> always use uint index data (both merged/unmerged, convert when needed - with some rhi backends this is implicit) QSG_RENDER_LOOP -> to override the render loop as usual. The default with RHI is threaded for Metal, threaded for Vulkan on Windows, basic for Vulkan on Linux and Android (to be checked later), while the existing rules apply for OpenGL. Not supported when running with QRhi: - particles - compressed atlases (though this is transparent to the apps) - QSGRenderNode - QQuickRenderControl - QQuickFramebufferObject - certain QQuickWindow functionality that depends directly on OpenGL - anisotropic filtering for textures - native text may lack some gamma correction - QSGEngine applicability unclear - some QML profiler logs may be incorrect or irrelevant Change-Id: I7822e99ad79e342e4166275da6e9e66498d76521 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Remove unused includes and Q_DECLARE_METATYPEs re: QLinkedListMarc Mutz2019-06-061-1/+0
| | | | | | | | | | | | | | | | They were all unused. Change-Id: I2b147b5a479f278c0607ef432faf1cb9e8e06236 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Tooling: Guard use of QRegularExpressionUlf Hermann2019-05-232-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | The Qt we are using might be compiled without regular expressions. The epxression in qqmldebugserver.cpp is actually not needed as QString::toInt() can do this check for us. The ones in globalinspector.cpp are only for reformatting the name in a nicer way for the selection highlight. We can skip those in case there are no regular expressions. Change-Id: I71e3f0314d8a68a41c3da2568207e311c6b41d1b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Tooling: Use QRegularExpression rather than QRegExpUlf Hermann2019-05-222-6/+4
| | | | | | | | | | | | | | Task-number: QTBUG-72588 Change-Id: Ib79107ea01de2dee49dc783f1d88807d1852c3ba Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
* | Split CompiledData::CompilationUnit in twoUlf Hermann2019-05-161-1/+1
| | | | | | | | | | | | | | | | We need a CompilationUnit that only holds the data needed for compilation and another one that is executable by the runtime. Change-Id: I704d859ba028576a18460f5e3a59f210f64535d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-101-4/+4
|\| | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlmetatype.cpp src/qml/types/qqmlmodelsmodule.cpp Change-Id: Idc63689ba98d83a455283674f4b5cf3014473605
| * Fix qtdeclarative build configured with -qreal=floatDonald Carr2019-03-311-4/+4
| | | | | | | | | | | | | | There is a sole point of failure in Qt 5.13 beta1 Change-Id: I58a41e310604a8bccbf14f463f734877d6a65a73 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Remove unused includes of qv8engine_p.hUlf Hermann2019-04-093-3/+0
| | | | | | | | | | Change-Id: Ic135a863581d29a3afb9c6c7f070d2630b3913b4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-264-68/+183
|\| | | | | | | Change-Id: Iaaf9749a812c21c065ded0374ce0aa07de7752cf
| * Fix preview zoom problems on windowsTim Jenssen2019-03-224-68/+183
| | | | | | | | | | | | | | | | | | | | Apparently the window is moved to random places on multi-monitor setups on windows. Fixes: QDS-263 Change-Id: I21082c7031fefff3057074c147e82df7a88f4f78 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | V4: Clean up the runtime functions declarationsErik Verbruggen2019-02-052-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | The declarations and usage of runtime functions have seen a number of changes: - we don't use the array of method pointers anymore because we don't use cross-platform AOT JITting - the check if a method can throw a JS exception was invalid, and was not used anymore - value-pointer vs. const-value-ref was inconsistent This patch cleans that up. By fixing the exception checking, we can now use it in the baseline JIT to automatically insert those checks. To make that work correctly, all runtime methods are in a struct, which gets annotated to indicate if that method throws. (The old way of checking which type of engine was used is fragile: some non-throwing methods do not take an engine parameter at all, and those got flagged as throwing). By using a struct, we can also get rid of a bunch of interesting macros. The flags in the struct (as mentioned above) can later be extended to capture more information, e.g. if a method will change the context. Change-Id: I1e0b9ba62a0bf538eb728b4378e2678136e29a64 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-113-5/+16
|\ | | | | | | Change-Id: If18e582a7210dae046426d97af530ab7ef47ddf4
| * Fix leaking resources by OpenVG scene graph backendKirill Burtsev2018-11-143-5/+16
| | | | | | | | | | Change-Id: I4e67c639d8343e39673ef5ea08bda7af033fb19f Reviewed-by: Andy Nichols <andy.nichols@qt.io>