aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate the necessary bits of qtdeclarative after wip/qt6 mergeAlexandru Croitor2019-10-149-33/+107
| | | | | Change-Id: If58c29baf7fa3c3591968fca6d11f7649308dbf9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-11308-1130/+6376
|\ | | | | | | Change-Id: I4a91928610f79c8e21a05781953ffa41508c828a
| * Merge remote-tracking branch 'origin/dev' into wip/qt6Ulf Hermann2019-09-05308-1127/+6377
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/qml/qqmlengine.cpp src/qmlmodels/qqmlmodelsmodule.cpp Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404
| | * ColumnLayout and RowLayout documentation typoJeremy Katz2019-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | from left ro right => from left to right Change-Id: Id7386a89438f74573bdb4b43702eadabb6805e50 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * Merge "Merge remote-tracking branch 'origin/5.14' into dev"Qt Forward Merge Bot2019-09-0412-96/+644
| | |\
| | | * Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-09-0412-96/+644
| | |/| | | | | | | | | | | | | Change-Id: Idade92fa5db03faee91c770a52131f35ab938ad7
| | | * PathMultiline: handle directly-bound QVector<QPolygonF>Shawn Rutledge2019-09-033-7/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotest in 811b15bd161d12e5c85e093f9f492a0c4fa278d6 only tested what happens if the vector of polygons is passed via a QVariant to the PathMultiline paths property. But the intention (as documented) was to literally support an object with Q_PROPERTY(QVector<QPolygonF> paths ...) and binding that paths property to PathMultiline.paths. In that case it appears in QQuickPathMultiline::setPaths() as a QVariant<QJSValue>, canConvert<QVector<QPolygonF>>() returns false, then canConvert<QVariantList>() returns true. Nevertheless each variant in the QVariantList is a QPolygonF, as expected. So we need another check to detect this case. Also added a test specifically for that. Fixes: QTBUG-77929 Change-Id: I84d0a45326d5f007b8ba3cc9bb1fbccf0345d812 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | | * Allow semicolon after property declarationFabian Kosmale2019-09-033-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the rules already had Semicolon at the end, however it was missing for UiScriptStatement, list properties and UiObjectInitializer. This change fixes the regression from 5.11.3 to 5.12.0, and keeps the behavior consistent. Fixes: QTBUG-77954 Change-Id: I45ef35fab399e3f971444b96d4a9ec6a99e29e09 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | | * PathMultiline: allow lists/vectors of polygons or point lists/vectorsShawn Rutledge2019-09-025-35/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a C++ model object can make a vector of vectors of points available directly, and it is bound to a PathMultiline's paths property to provide the view layer, it's a waste of time to convert it to a QVariantList of QVariantLists and back again. Changing the type of the property to QVariant instead of QVariantList enables an extensible set of supported types: all those that make sense. Fixes: QTBUG-77929 Change-Id: If749c2171173e7b9933fc9ecdf6d2741dc1c7500 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | | * Enable PathPolyline to take a QPolygonF or QVector<QPointF> pathShawn Rutledge2019-09-025-18/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a C++ model object can make a vector of points available directly, and it is bound to a PathPolyline's path to provide the view layer, it's a waste of time to convert it to a QVariantList and back again. Changing the type of the property to QVariant instead of QVariantList enables an extensible set of supported types. Task-number: QTBUG-77929 Change-Id: I2453b59e047ec3310070e943f6934c9ddcd1ffaa Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | | * Visit lists iteratively when parsing QMLUlf Hermann2019-09-021-35/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I243d12b75a07ac04560b444c326bff77d0dc642c Fixes: QTBUG-74087 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.14' into dev"Qt Forward Merge Bot2019-08-3124-43/+380
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-08-3124-43/+380
| | |/| | | | | |/ | | | | | | | | Change-Id: I13ae62ef5a45defc53c6909760fc44beaf58908e
| | | * Fix pedantic warnings in QQuickImageShawn Rutledge2019-08-301-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - semicolon after switch is not necessary - a switch that covers all possible cases should not have a default case: that way if someone adds another enum value, she needs to think about what it means in that switch - hopefully it was not intentional to ensure that targetRect has integral size in the PreserveAspectCrop case; it's not an explicit cast, so it looks like a mistake Change-Id: Ie7525137e826ed3ea03ac1dc9d2563e791379b42 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | | * Add a createTextureFromId() alternativeLaszlo Agocs2019-08-307-7/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Say hello to createTextureFromNativeObject(). This is the future replaecment for createTextureFromId(), and is capable of operating on both the direct OpenGL and the RHI code paths. In practice this allows creating a QSGTexture that wraps - but does not own - an existing VkImage, ID3D11Texture2D*, MTLTexture*, or GLuint. Change-Id: I500ee4c76da67eca1a70599a30b03d7b126b570d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| | | * QQuickFbo: add the RHI warningLaszlo Agocs2019-08-302-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class will probably go away in Qt 6. "Probably", because it is not yet clear if/how an alternative will be provided. Change-Id: Iba205c394a97bf8d2c1001f8f42ad26be6841b09 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| | | * Add a note to QSGEngine about its incompatibility with the RHILaszlo Agocs2019-08-302-0/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Id9d6ce4a531d2cd1b79b3bb9224a5567ead42799 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | | * Fix build with -no-feature-quick-pathJohan Klokkhammer Helsing2019-08-302-3/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I7ed2c190ffe9ddd83aeee28de3c5d87269ec53ee Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | | * Avoid introducing rhiTexture() in the public API of QSGTextureLaszlo Agocs2019-08-295-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need for this. The few internal users can get it via QSGTexturePrivate. The original thinking was based on QRhi* being a public API, but that is not the case in the near future. So avoid introducing a public API relying on QRhiTexture. This of course makes it impossible to retrieve the native object under a QSGTexture (as textureId() is not used anymore when rendering with the RHI). For that, an alternative approach will be introduced later on. Change-Id: I0099b23424cafa4958f78c03300b0c934b60d92c Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | | * Fix not printing logs with QSG_INFO when forcing rhi backend from C++Laszlo Agocs2019-08-293-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickWindow::setScenegraphBackend() may be called before QQuickWindow gets a chance to create a render loop. If QSG_INFO (the env.var.) is used instead of the logging category (qt.scenegraph.general), some logs are not printed because the code that enables the logging category is not yet run. To prevent confusion, make sure the logging category gets enabled before the first potential qCDebug. In the worst case we check twice but that's fine. Change-Id: Ibfc0af05050adc9766c30a2d15c778b2a51823fe Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| | | * Set point size in visualization vertex shaderLaszlo Agocs2019-08-292-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in order to avoid a validation layer warning with Vulkan when visualizing overdraw on a scene that includes drawing points (like some types of particles). Change-Id: Ia0a40f850ce5f7a0374c7b8779d5342f191c6973 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| | * | Fix build without features.easingcurveTasuku Suzuki2019-08-302-0/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: If8de1f1a61fda051fb5585b8966bc1bfe94c97a3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * | Fix qqmltypeloader autotest for androidJan Arve Sæther2019-08-293-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a1a3c225119c4ab972beccff68d0d4b764aab4d Task-number: QTBUG-73512 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.14' into dev"Qt Forward Merge Bot2019-08-2914-14/+110
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-08-2914-14/+110
| | |/| | | | | |/ | | | | | | | | Change-Id: I4c8a9300ec028ac7e4f532e4094ab8898e227276
| | | * CMake: Document newly introduced QT5_IMPORT_QML_PLUGINS functionAlexandru Croitor2019-08-282-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-38913 Change-Id: I25ada92de8c7d7186c9b083b8a8ccc4427945b28 Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * QQuickDragHandler: Add revision to snapModeUlf Hermann2019-08-282-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This property was added in Qt 5.14. Change-Id: I48ebc614490e67440419965983126740c4443d0e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * Android multiarch supportBogDan Vatra2019-08-282-2/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifa70d6cb36be385280364cca9dd4e31b43aa9a18 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | | * Merge dev into 5.14Kari Oikarinen2019-08-27199-722/+4029
| | | |\ | | | | | | | | | | | | | | | Change-Id: I3ae119563f41fda63ac2b452f2d05fa83e411faa
| | | * | Improve error message when setting to a property with unknown typeAleix Pol2019-08-236-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment we were being told that the types were incompatible but the truth was we were comparing to nullptr. This patch makes it apparent that the assigning broke because the type comparison never happened. Change-Id: I29728eedeee13c3bc9389213735df142f56e9c34 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | | * | QQmlBind: Fix qdoc warningFriedemann Kleint2019-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix src/qml/types/qqmlbind.cpp:370: (qdoc) warning: Missing '\endlist' Change-Id: I687b136caa1a1696b5efc5d8352baedfe091c89b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | | * | qqmlconnections.cpp: Fix deprecation warning about QStringFriedemann Kleint2019-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types/qqmlconnections.cpp:328:72: warning: ‘QString::QString(const char*)’ is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations] Change-Id: I3c9a341a955010a643c17e2e0a58dfdc05728e93 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | | Bump versionKari Oikarinen2019-08-271-1/+1
| | | |/ | | |/| | | | | | | | | Change-Id: I454b46a5dbab5ac68c488aa2a25ca244e36277db
| | * | Harmonize meta object revisions and minor versionsUlf Hermann2019-08-2622-111/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid complexity we want those to match. We can easily "rename" the meta object revisions as those are not public interfaces. Change-Id: I48e063d49758c7bacd9b7816bf5541cf67e07b0d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Regenerate plugins.qmltypesUlf Hermann2019-08-2616-47/+677
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e470d08ee93c44663e6f99cebe7817c90cba3e4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Make the qmllint test an actual testUlf Hermann2019-08-262-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I59a96cbef9a68454b68a37e5c7aed45cb4009785 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | QQuickPinch: Declare notify signal for targetUlf Hermann2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we can figure out from the metaobject that this signal actually notifies about target changes. Change-Id: I2151990e906e375f807b2d952e8f183a19529394 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Stabilize image and borderimage multiFrame testsShawn Rutledge2019-08-242-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are various problems on QEMU: color depth may not be 32-bit, and for some reason grabWindow isn't always working. Task-number: QTBUG-77817 Change-Id: I10db56e93643722d1d6a85e66b9dd552ee654432 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Move currentFrame and frameCount properties up to QQuickImageBaseShawn Rutledge2019-08-2423-39/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AnimatedImage already had these properties, but some typically non-animated image formats such as PDF, TIFF and ICO can also support multiple pages. In either case, the currentFrame property can be used to select a specific frame or page. However an AnimatedImage uses a QMovie to do that, whereas a plain Image uses QQuickPixmap. So the accessors need to be virtual in order to have these different implementations. [ChangeLog][QtQuick][Image] Image and BorderImage now have currentFrame and frameCount properties which can be used to step through the frames of multi-page image formats such as TIFF, WEBP and ICO. Task-number: QTBUG-77506 Change-Id: Id4d95a99a26a862957e44b1bd8ffe06d7eababef Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * | Remove usages of deprecated APIs of QWheelEventSona Kurazyan2019-08-237-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I69b0c4ec7c03f9421b18828516e064eff2b45518 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | QQuickImageBase: prepare for rescalable PDF as an image formatShawn Rutledge2019-08-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickImageBasePrivate::updateDevicePixelRatio() assumes that only SVG or an image provider can provide a scalable image. Now that PDF will be supported, we can add it to the list. Change-Id: I9a6df7c58cb9db0e8d4d159c138bedd481281d92 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * | qmlplugindump: Handle types reexported by QtQuickFabian Kosmale2019-08-221-61/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that our own types are not registered with qmlRegisterType<T>() anymore, we can use QQmlType::module to decide whether a type should be included in the qmltypes file. We include types with no module, to support existing user code which still calls qmlRegisterType(). Change-Id: Iee0a132bf5b3ddcdfc222ab4b2d37a1f05b1851d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Remove an unused event type in the threaded render loopLaszlo Agocs2019-08-223-34/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I505ba09d6a0144f18bf29cda2f549c8b69ada1a5 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | * | rendernode example: Add support for MetalLaszlo Agocs2019-08-2211-4/+529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus clarify QQuickWindow::begin/endExternalCommands() in combination with QSGRenderNode in the docs. As the example demonstrates, calling these functions is not necessary within render() of a render node. Also fix an issue with resetting the scissor in the renderer after calling render() of a QSGRenderNode. Change-Id: If8c2dab38d62aa444266d37901f062a51e767f68 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | * | Add missing scenegraph example docsLaszlo Agocs2019-08-2212-1/+320
| | | | | | | | | | | | | | | | | | | | Change-Id: I72e18136a26cdfb52f204ce7d0491d14411956a4 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | * | Implement QSGRenderNode for the rhi pathLaszlo Agocs2019-08-227-64/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation is also refined and extended. Revise the rendernode example as well: make it possible to test and demonstrate both scissor and stencil based clipping. An implementation of the triangle for another graphics API should follow in a separate patch at a later point. For now only OpenGL is supported in combination with the RHI. Change-Id: I7ef9f6c6e0b44f1bdf44c9266ea3fa4736367a5d Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | * | Make ImageParticle functional when rendering via the RHILaszlo Agocs2019-08-2218-147/+884
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Involves a trivial (albeit time consuming) rework of the existing materials as well since their reliance on QSGSimpleMaterial makes them problematic to live side-by-side with the RHI variants. Change-Id: Ie12b7949904434b3a831588518c8268e917ce92f Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| | * | qqml.h: add qmlRegisterAnonymousTypeFabian Kosmale2019-08-216-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version behaves for the most part like qmlRegisterType(), but it adds a uri and major version, which qmlplugindump can use to put the tpyes into the correct plugins.qmltyes file. Change-Id: I50f620216439a3edc66ac740cb051c2fbb936e51 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Fix deployment of QtQuick for Android with dummy_imports.qmlJan Arve Sæther2019-08-213-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We rely on the qmlimportscanner to find out what to deploy, but it is limited to scanning .qml files. These tests creates the QML code from C++, so qmlimportscanner fails to detect those dependencies. Therefore, we add a dummy_imports.qml file that has the sole purpose of giving qmlimportscanner which additional dependencies the test has. Change-Id: I4237b738e408c309b9b21de7e53d1a4e4acb7e2e Task-number: QTBUG-73512 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Postpone the deprecation warning for Connections onFoo until 5.15Ulf Hermann2019-08-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-77734 Change-Id: I5c666d0aa9ec41f3d9bfcb78869b98336ede557b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 07:40:02 +0000