aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace Qt's MidButton with MiddleButtonEdward Welbourne2020-07-225-5/+5
| | | | | | | | | | The latter has been the preferred name since Qt 4.7.0. Added a comment on where the old name is exposed to QML that it's only for backwards compatibility. Pick-to: 5.15 Change-Id: I2c5088d597dd7327cc5899d06afb180d0ec2893e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* QQmlIRLoader: Restore inline components correctlyFabian Kosmale2020-07-223-0/+25
| | | | | | | | | | | | | | Whether a component is an inline component is not only stored in the flags, but also in the isInlineComponent member. Ideally, this should be unified and the member removed, but for now we just restore the value correctly. Adjusted tst_qmlcachegen::initTestCase so that we testFile and testFileUrl are actually usable in the test. Fixes: QTBUG-84237 Pick-to: 5.15 Change-Id: I759cd6b8914b186b9e5c8118863fc8d0580d21af Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Blacklist QQuickLoader's urlToComponent test on macosUlf Hermann2020-07-211-0/+2
| | | | | | Task-number: QTBUG-85622 Change-Id: Ib2814fe1d69b641e9e8b72e682f172bdad77b9f5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* tst_qquickimage: Fix test when running on HighDPI screenTor Arne Vestbø2020-07-201-4/+10
| | | | | Change-Id: I3018355df2a69c7d5a80d18d3d58ac365f1c0b49 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-171-2/+2
| | | | | Change-Id: Ic6ee8c97bd8b78de34620cc48e4c90c69975973a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Blacklist QQuickAnimations' reparent testUlf Hermann2020-07-171-0/+2
| | | | | | Task-number: QTBUG-85624 Change-Id: Iebef044d3f5cb9053079eaa9106e9e5c8b1ebd03 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Deal with variable renaming in QDropEventShawn Rutledge2020-07-171-2/+2
| | | | | | | | | qtbase ea2ae140e99bbd21515a99c5480e53129ef843c3 gave QEvent variable names a consistent naming convention, but QQuickDropEventEx inherits QDropEvent and directly accessses them, so it needs updating. Change-Id: Id0a593145a292828504b22d557acae980f8357ec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-171-2/+2
| | | | | Change-Id: I6cc0144bf5c92095ba37ac03ba453f429d14a129 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-161-1/+1
| | | | | Change-Id: I8539dc721b8229a25f16b4c28af0ac29174c63e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Restrict qmlRegisterTypesAndRevisions to major version givenUlf Hermann2020-07-166-12/+104
| | | | | | | | | | | We should not register any revisions larger than the given major version as that allows importing an incomplete module, as the version-less import. Typically the offending version is pulled in via some QML_FOREIGN and only the types derived from that foreign class are available in the higher major version. Change-Id: I186fb010d704bea514cefff9f66eb58186df5c91 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-161-2/+2
| | | | | Change-Id: Ie850b72ee691d77059dd6fcb33c5b91c1281462d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-151-2/+2
| | | | | Change-Id: I4c58fab049686410c3aeb05fa4f2c33066dd0b1c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Adapt to new members in QMetaTypeInterfaceUlf Hermann2020-07-151-0/+2
| | | | | | Change-Id: If355b891651b77fcc4e0ad5cc5db789807b83c11 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Keep replaying touch press as mouse press after Flickable.pressDelayShawn Rutledge2020-07-151-1/+13
| | | | | | | | | | | | In the future, if QQuickFlickable has pressDelay set, and receives a touch event, we want it to replay the touch after the delay. But in Qt 5 it can only replay a delayed mouse press, and hacks are in place to deal with that. We aren't ready to change it all just yet, and need to keep the autotest working as-is for now. Task-number: QTBUG-78818 Change-Id: Ib37ccfc2b1b84254f40acac8f8ca8c51c9a88ddf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Begin handling the QEvent refactoringShawn Rutledge2020-07-1510-178/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | This is an intermediate step to get Qt Quick working again after qtbase 4e400369c08db251cd489fec1229398c224d02b4. - QQuickEventPoint::id() is no longer unique across devices, because now eventPoint.event.device tells which specific device the event comes from. (In Qt 5, we could not yet add the device pointer to QInputEvent.) - However, MultiPointTouchArea's docs say that each pointId is unique, and so do the HandlerPoint docs (for similar use cases with PointHandler). So we still need the same hack using a Qt-specific short device ID to unique-ify the QEventPoint::id(). Now we use the device index in QInputDevice::devices() as the short ID. - Otherwise, we trust QInputDevice::systemId() and QEventPoint::id() more than before. - Use QMutable* classes from qevent_p.h to continue using setters that were in QTouchEvent before, etc. But setTouchPoints() is not there, so we have to make new event instances in a couple of cases. - QGuiApplicationPrivate::setMouseEventCapsAndVelocity() and setMouseEventSource() are gone. - Use (compiler-written) event copy constructors when possible. Task-number: QTBUG-72173 Change-Id: I3915dc535ae4c5a81cbf333aba9355f01c420c15 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Adjust qqmlpropertybinding to the changes in QPropertyLars Knoll2020-07-152-16/+19
| | | | | Change-Id: Iaea6428fe9a6de69d8022089da590c42f94ea977 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Replace QTouchEvent::TouchPoint with QEventPointShawn Rutledge2020-07-1518-255/+255
| | | | | | | | | | | | It's a cosmetic change at this time, because we have declared using TouchPoint = QEventPoint; Also replace Qt::TouchPointState enum with QEventPoint::State. Task-number: QTBUG-72173 Change-Id: Ife017aa98801c28abc6cccd106f47a95421549de Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Adapt test to automatic comparator registrationFabian Kosmale2020-07-151-1/+0
| | | | | Change-Id: I28d8f811f9173a92d977acaf7b8c7e0bbbe98f07 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Temporarily skip part of tst_TouchMouse::buttonOnDelayedPressFlickableShawn Rutledge2020-07-151-0/+1
| | | | | | | | | | We can revisit tests involving the replaying of press events soon, after getting them replayed as the original type, i.e. stop synthesizing mouse for touch during replay. Task-number: QTBUG-85607 Change-Id: Ib978c84a5e61bb21e0dc017eb386cadec5390418 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add equality operators for QQmlError and QQmlRefPointerUlf Hermann2020-07-153-0/+13
| | | | | | | We need those to declare QProperties. Change-Id: I49bf656607931e5d50f6a07cac92b7e176bb2b75 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QQmlListReference: add operator==Fabian Kosmale2020-07-132-0/+11
| | | | | | | | | | | | | This is needed after the QVariant equality change in order for QQuickTableView to work correctly. QQuickTableViewPrivate::syncModel compares two variants, modelVariant and assignedModel. Without this change, this comparison would always fail, even if assignedModel had been previously assigned to modelVariant. With this change, the comparison returns true again when the two QQmlListReferences have the same identiy (i.e., same d pointer). Change-Id: I9f71e530928408f14a78df4b743e5700a2d104b2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove explicit registration of QKeySequence::StandardKeyUlf Hermann2020-07-131-9/+0
| | | | | | | | | | | As QKeySequence itself gets registered in qquickforeignutils_p.h, its enums will also get registered. There is no point in doing this explicitly here. Task-number: QTBUG-85559 Change-Id: Ifb4129717d9daa9d5c46e12086ece2d0b59f535a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Require bigobj support for typeregistrar filesFabian Kosmale2020-07-101-0/+2
| | | | | | | We already had this for mingw,this adds the equivalent for MSVC. Change-Id: I0febe36ca124ed62d5c4f94bdaed46cb55832525 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add userdata callback to qml registrationMaximilian Goldstein2020-07-108-34/+39
| | | | | | | This is needed in order to remove PySide2's qml type limit. Change-Id: I331d9e31574a744eb9085222d58ea8a8789e0e31 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix QQmlValueTypeWrapper::method_toString()Ulf Hermann2020-07-091-3/+4
| | | | | | | | | | | QMetaType::convert() is notoriously hard to use. You cannot keep the QString on the stack as QString because its dtor will unconditionally be called when the scope is left, no matter if the conversion succeeded. Therefore, keep an array of quint8 on the stack and manually call the dtor if the conversion succeeds. Change-Id: If7970ff6adb4cc2a822a065f9f07130065ce9502 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* StringOrTranslation::toString: fix string checkFabian Kosmale2020-07-091-2/+3
| | | | | | | | | arrayData can now be null, because shared null for QString has been removed. Instead of checking for arrayData, we now check whether the stringSize is larger than 0. Change-Id: I81e683bb8394ee84b291098add3f62636a697a8d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Compile against latest qtbaseLars Knoll2020-07-099-17/+23
| | | | | | | Adjust to the lastest changes in QList and QString. Change-Id: I216b2746a3305222a21c5aead3aec6106ac1f035 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-091-2/+2
| | | | | Change-Id: Ie78f8141594510fbb7cdb788e1cf216a10f4e151 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Replace QInputDevice::id() with systemId()Shawn Rutledge2020-07-092-4/+4
| | | | | | | Required after qtbase c7c28b340662915a9f8fdb84c0a94c458fe6a290. Change-Id: Ife9efbf802e1e8984a950fa255e8917e2398cc7a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Regenerate projectsAlexandru Croitor2020-07-0931-74/+184
| | | | | | | | | We need the qt_add_tool changes to successfully configure qemu builds. The rest of the changes are just to be in sync with the .pro files. Change-Id: I7bcc08ac58f57a5761aedef09761428c55235289 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Adjust qqmlenginedebugservice to int -> qsizetype changeFabian Kosmale2020-07-091-3/+3
| | | | | | Change-Id: I3743c23467a78228e564ffcbae156f4c60b82de7 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* docs: Mention URL object in url documentationMaximilian Goldstein2020-07-091-0/+5
| | | | | | Task-number: QTBUG-54988 Change-Id: I41c9cd0488db338b5dc1a2d5b8c4d707770b6ba8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmlformat: Allow for minor and major versions to be omittedMaximilian Goldstein2020-07-083-2/+14
| | | | | Change-Id: I85897930980bb98ba9f968cdf70696547493b1d5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* CMake: Enable enforcing CI testsAlexandru Croitor2020-07-081-1/+1
| | | | | | | | | | | | Any failing tests in CMake configurations will now prevent integrations to go through in this repository. Task-number: QTBUG-84886 Change-Id: I96b60dd272a33bb226a3cf1ec766a846996b66cf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmlimportscanner: Use QmlDirParserUlf Hermann2020-07-0852-74/+1033
| | | | | | | | | | | | | | This gives us a reliable way to parse imports and versions. Apparently we can also have multiple classname entries in the same qmldir file. Reflect that in the parser. Also, drop the version field from the output. Nobody uses it and maintaining it while allowing partial, missing and auto versions would be rather difficult. Fixes: QTBUG-85304 Change-Id: Iab89a6d505a3c58174e623f02f0418899cb5fa2f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmlplugindump: Fix handling of dependenciesUlf Hermann2020-07-085-62/+61
| | | | | | | | | Tolerate dependencies without version and don't write them into the output anymore. No one should read them as the same info has to be available from the associated qmldir files. Change-Id: I5e4cd93c83cb5e874a8a6e1467461d081b1a089c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* CMake: Fix failing tst_qmlcachegen::skippedResourcesAlexandru Croitor2020-07-073-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | The test was failing in CMake configurations because the pro2cmake generated code set the QT_SKIP_QUICKCOMPILER property on a non-existing file path (it was missing "data/"). Fix this manually by specifying the correct file path. Add a SkipQmlCacheGen.qml file to make it more clear what the file is used for. The previous alias from Retain.qml to Skip.qml was confusing, and also was overriding the source file properties on the same file that was part of 2 different resources. Keep the alias to Skip.qml so we don't have to touch the C++ code. pro2cmake will be fixed in a separate change to output correct file paths. Amends 41890402db086f4c61e052cef7659eb6b003dc77 Task-number: QTBUG-85364 Task-number: QTBUG-84886 Change-Id: I6e49deb8758403241d6f804af797adf2f05fda05 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* QSGTexture: Remove doc references to bind()Laszlo Agocs2020-07-061-9/+8
| | | | | Change-Id: Ibcdf6cb940c0f95a5baba0887b01a149611dfe04 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* layer: Check for <1 not ==0 when bailing out due to no sizeLaszlo Agocs2020-07-061-1/+1
| | | | | Change-Id: I87798db04e0bca6c2ea173b1b946549a747b2124 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-061-2/+2
| | | | | Change-Id: I8f66ce0c90ffc07909c1ec19b00ba6ea9b10ae72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-061-2/+2
| | | | | Change-Id: Ibb00752be829c9d21ff18368fc4b5da8f60bf679 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Prepare Qt5QuickCompiler.cmake.in for Qt6Ulf Hermann2020-07-056-103/+23
| | | | | | | | | | Increment all the version numbers. Replace qtquick_compiler_add_resources with a warning and a call to qt6_add_resources. Task-number: QTBUG-85190 Change-Id: Ifed5449ab4d6312a57add870eee13175872146db Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Give a better score for methods with a convertable type when matchingAndy Shaw2020-07-034-1/+41
| | | | | | | | | | | | When it is looking for a matching method based on the argument types, then if a QVariant can be converted to that type then it should give a better score for that method. This is so that it can see it as being more viable a choice when calling the method instead of potentially not being able to find a matching one. Pick-to: 5.15 Change-Id: Ief7e11feacd1d0b0959330af2576c2d01affbc54 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* URL: Allow non-string parametersMaximilian Goldstein2020-07-032-5/+14
| | | | | | | | | | Previously we only allowed string parameters as the first parameter of the URL constructor. This excluded types like url. The behavior of instead trying to convert the parameter to a string and then interpreting this as an url matches the specification more closely. Change-Id: I6ef8db9d8c0f238ba8c51b1023decdfcc1caad87 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-031-2/+2
| | | | | Change-Id: I146067949925d41ef42a3c1e3f22d1b7a8749a24 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: Explain how to work around the linker removing registrationsUlf Hermann2020-07-021-0/+17
| | | | | | | Fixes: QTBUG-83402 Pick-to: 5.15 Change-Id: Ie8dc93afb3c3333d1263dcf0f13b41c833de91d5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Make the qtquick and qtqml plugins optionalUlf Hermann2020-07-0217-141/+58
| | | | | | | | | We can do the initialization and de-initialization as constructor and destructor functions. Then we don't need to load the plugins. Task-number: QTBUG-84639 Change-Id: I2aeeee7e8d028555e3af91e93518c2c2afd70dbb Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-07-021-2/+2
| | | | | Change-Id: I9e23a5c8582d7441e75ca9e675d771cccac678cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qmlformat: Fix handling of empty blocksMaximilian Goldstein2020-07-022-5/+7
| | | | | | | | | | Empty blocks were often not handled properly. (i.e. in if, for and while blocks) Fixes: QTBUG-85321 Pick-to: 5.15 Change-Id: I4035dd239a095814362e0aec142b387dc113f282 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* qmlformat: Fix template literalsMaximilian Goldstein2020-07-023-0/+12
| | | | | | | Fixes: QTBUG-85317 Pick-to: 5.15 Change-Id: I52589b681690a55f7bba7d7d9c675dc22ffa1587 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 18:26:23 +0000