aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* QV4 Engine: Remove MSVC special casingFabian Kosmale2020-12-153-18/+2
| | | | | | | | | | | This patch removes a workaround for old versions of MSVC; we should be able to rely on the standard library nowadays. Original-patch-by: Alexander Neumann Fixes: QTBUG-89203 Change-Id: I8047565000fc7e4e3b8ac28584ff4a479b648274 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit fb4de27768935393744cbd67e9789d325e70e742)
* Bump versionPaul Wicking2020-12-111-1/+1
| | | | Change-Id: Ia29f90d30a991f623fd8693f3d8baa563fff6493
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-111-2/+2
| | | | | Change-Id: I16a37b0efe2acd6d34ead3411bce1bc4e89dcbed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-111-2/+2
| | | | | Change-Id: Iaedb171757e990dccf7d70e5076787e737613632 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Regenerate projects using pro2cmake one last timeAlexandru Croitor2020-12-1012-12/+334
| | | | | | | | | | And fix up some incorrect qmake project files Change-Id: Ia6d27ac68195635021fe7c4a5f06386a60f3f323 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit c1c4a874e31ba108a3600fbbb0aee7fc0bf34601) Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Refactor QQuickTextInput test to use QKeyCombinationVolker Hilsheimer2020-12-101-64/+37
| | | | | | | | | | | Makes the code typesafe, simplifies the data structures, and fixes a compiler warning from implicit conversion from/to int. Fixes: QTBUG-89356 Change-Id: I52d834811fa7325788fc71ea20f78b4afe3fdb86 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 8257cf75c68bd3d2a2af0cd8260e3cc96f5d0df4) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* qqmltypeloader: Fix plugin not loading on MinGWMaximilian Goldstein2020-12-101-1/+1
| | | | | | | | | | | | Usually libraries get a lib prefix when using MinGW but plugins are expected to not have a prefix, causing the plugin to not load properly. This change fixes this by using the MODULE keyword. Fixes: QTBUG-89187 Change-Id: Icd543015805a8157d59c20e86134421911930ea1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 323cdf820c723660f3c67c3fd583f0b28c8d80a2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-101-2/+2
| | | | | Change-Id: I9a410bdb307f6754a4ef488d373041930d6f67d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-101-2/+2
| | | | | Change-Id: I4ab7a8014a932e1a4caf3d75688b1e054f11902a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Disable static plugin imports for qml static pluginsAlexandru Croitor2020-12-101-0/+3
| | | | | | | | | | | | | There is no point in generating cpp files containing Q_IMPORT_PLUGIN() macro calls for qml static plugins. It causes unnecessary compiling of 10+ files for each such plugin. In a static Qt build, plugin imports should only be done for executables, tools and applications. Change-Id: I9d02ca9272a0765e2620cd8860afadd8546e3c37 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 4e7ee1279cad0f49483895c3237fd86a6359aedd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-091-2/+2
| | | | | Change-Id: I51604a88a100dc1cc0d4aa2b8c5ac9766727b95b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-091-2/+2
| | | | | Change-Id: I8620b387073792588093717fe03a6b85cfa6dc42 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Show a tableview even if the syncView has an empty modelAndy Shaw2020-12-092-5/+45
| | | | | | | | | | | By showing the tableview, we can be sure that headerviews will be visible even in the syncView has an empty model. Fixes: QTBUG-87526 Change-Id: I68c8b119122a2d2f88c2afbeb2d6c71a83a3ce33 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 27c254203b3e7dd6d3a4445feb205fbe98c32d30) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-091-2/+2
| | | | | Change-Id: Icf2f75350d9c06aadfaf5fd5e3ea08d97533c4c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-091-2/+2
| | | | | Change-Id: I107be8a88e19ebefa727a57a9f75eba37fed8825 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-081-2/+2
| | | | | Change-Id: Ie20d398d1c50647afa60afcccf7b8028fe92cf71 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-081-2/+2
| | | | | Change-Id: I64fa390d8a770f5491b5188509725dcd116cdb4e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix occurrences of \Q_OBJECT in code snippetsTopi Reinio2020-12-086-73/+260
| | | | | | | | | | | | | | | 'Q_OBJECT', even in a comment, interferes with automoc. Prefixing it with a backslash solves the automoc issue, but documentation looks wrong as content inside \code is taken verbatim. Move code snippets to doc/snippets and refer to them with \snippet commands. Change-Id: Ied7fdf87ef5edd2b237498b91b162c19bf7bc636 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit ed6f55ca126c80514e886b3b400a22ba5d443589) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use load(qt_tool) and qt_internal_add_tool for qmltimeLi Xinwei2020-12-073-7/+41
| | | | | | | | | The qmltime should be a tool, not a normal executable or an app. Change-Id: I64c76877907297a6a817ba5903786bcc7fba8fdd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit e6e262da1423bcb7cfe3db9f83fe0df54483c8d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Kill Flickable's wheel momentum if angleDeltas not multiples of 120Shawn Rutledge2020-12-072-34/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wheel momentum is great on old "clicky" mouse wheels: they feel really clunky without this feature. But it's also terrible on most laptop touchpads. We still aren't generating QWheelEvents with pixel deltas and ScrollPhase on most platforms (still only on macOS); but eventually we should. However, those laptop touchpads tend to generate angleDeltas that are not multiples of 120. Added logging categories qt.quick.flickable qt.quick.flickable.wheel and qt.quick.flickable.velocity. [ChangeLog][QtQuick][Flickable] Flickable now tries to detect whether you're using a "clicky" wheel on a desktop mouse. A laptop trackpad can generate QWheelEvent::angleDelta values that are not multiples of 120; in that case, smooth scrolling with momentum is disabled, to avoid losing control of scrolling. Set the environment variable QT_QUICK_FLICKABLE_WHEEL_MOMENTUM_ENABLED=0 to opt out of the old behavior entirely, or set it to 1 to opt in unconditionally. Task-number: QTBUG-38570 Task-number: QTBUG-56075 Task-number: QTBUG-80720 Task-number: QTBUG-82565 Change-Id: I0da2d31259fa1c79ab217a3fa9e888893fc7b235 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 33c87736db7ec79c89c0497192727697d126628d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid unused parameter in QSGRhiSupport in certain configsLaszlo Agocs2020-12-071-0/+4
| | | | | | | | Fixes: QTBUG-88604 Change-Id: Id84faf648656993777f780e147917151ce05d3e0 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit b0f49c89780c7a1ce90b2c4e161bbba0d0beb868) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-051-2/+2
| | | | | Change-Id: I74910dfe0bb7ad703cfae68ba34e6c53d96844c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-051-2/+2
| | | | | Change-Id: Id23bb44e87b5a9310f927277f97925a48b8465dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove unused functionVolker Hilsheimer2020-12-041-3/+0
| | | | | | | Change-Id: I7ee5187b4e17f2aba2788adfb47325f7a7020d69 Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit 628af504fced03c41269749634b830775412410d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix qdoc warning, document macro parameterVolker Hilsheimer2020-12-041-1/+1
| | | | | | | | Change-Id: I60c3d9cc34bc658d5317da951cc1975990f27a9b Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> (cherry picked from commit e070e571d184b4f6eb1f065009aac0779d004f29)
* qmlfunctions.qdoc: Add QML_IMPLEMENTS_INTERFACESMaximilian Goldstein2020-12-041-1/+16
| | | | | | | Change-Id: I4ff76b49bd5f40eb58c9f44669bb4836dd9e48be Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 7b89ae6ef4158dcbd1940e088c84eba747c166bc) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-041-2/+2
| | | | | Change-Id: I45a1772a9644c24cfa53410b43ead10de07fa8fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Document how to use CMake for Qt QuickKai Koehne2020-12-043-1/+41
| | | | | | | | Task-number: QTBUG-73058 Change-Id: Ie72c1f4331ad05f31d9a646730133c97c4b15790 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c8b108ca76e29d5c1b55468a9659eef80a6afa86) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-041-2/+2
| | | | | Change-Id: Ice5a009fa435c1d72944ba79fff2205389ad2e21 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-041-2/+2
| | | | | Change-Id: Ic50d51cc6c7ca504e05aff5fb0563abd96ef7b94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_qqmlecmascript: Avoid memory leak on failureFabian Kosmale2020-12-031-3/+2
| | | | | | | Change-Id: Icf31fbe473e5b0659cfe09d5bef8652c22a2b1ce Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 355ff606853d885b9ad7c6e1549c3f25bfa48a2c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QML engine: Fix binding setupFabian Kosmale2020-12-035-2/+35
| | | | | | | | | | | | We set QProperty bindings up in the wrong way: Parent components would overwrite their child component's binding. This patch reverses the order, fixing the bug. Task-number: QTBUG-87153 Change-Id: I3e90d1d14a41a7c5c337745f1453484d360a3979 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 96e321bc5cf3c1a6d52374a6f4070a438032b08d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-041-2/+2
| | | | | Change-Id: I2e988c9b1cecb89fbaa7ccb25dc67ede43df103c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Do not highlight "Writing QML Extensions with C++" exampleKai Koehne2020-12-031-2/+0
| | | | | | | | | | This is a more complex example that is also not that visually appealing. Change-Id: Ia5ebfa407c6bcbd3d701068384bfd660833a867c Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 86b9ae4da1be2f797f6d6762d870555ee8c893de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't return reference to temporary QModelIndexVolker Hilsheimer2020-12-031-1/+1
| | | | | | | | | | Follow up on change in qtbase; QPMI casting to QModelIndex returns a value, not a reference. Change-Id: I227cd8ef64450986069837edee25512d9538286d Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 039c2801cfbd67e22da83f77375a06f7434b5c85) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-031-2/+2
| | | | | Change-Id: I26197d0d09c8efb983c63ee0f1a614940327186e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Document how to use CMake for Qt QuickTestKai Koehne2020-12-034-18/+51
| | | | | | | | Task-number: QTBUG-73058 Change-Id: Ia00916e8ce8193225a773f85fe2af87e334afaab Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 3bf876a771c6e9e62b506f4c99965fca6d0e7f3b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-031-2/+2
| | | | | Change-Id: I4cf3b2a2a219847faed041ccb311909f962879ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix documentation for qmlInfo, qmlDebug and qmlWarningAndreas Buhr2020-12-021-18/+15
| | | | | | | | | | | | qmlInfo, qmlDebug, and qmlWarning are not in the QtQml namespace any more. This patch adapts the documentation. Task-number: QTBUG-88533 Change-Id: I7fafd3fc2769c5ffad515cacaacdc7ccbe07db46 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 815b347abe821664b2f8a4db53866826a639d6bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add documentation dependency to qtshadertoolsAndreas Buhr2020-12-021-1/+2
| | | | | | | | | | Documentation links to qtshadertools. This patch adds qtshadertools to the dependencies so these links can work. Change-Id: Icb059fd681e7456f3452aeba60287bfa1cc3539e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1ea475099cd20dd57ff2a32bf3a0f9b6218c14ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix usage of oldcode and newcode in qt6-changes.qdocAndreas Buhr2020-12-021-2/+2
| | | | | | | | | | | There was wrong usage of \begincode and similar commands. This patch fixes it. Task-number: QTBUG-88533 Change-Id: I70b3d0104ba1dc8eb44556f35fc552e259317f88 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit ed098189d5809259378dc9a427a6fe6e303582ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Quick: Fortify QQuickApplication ctorUlf Hermann2020-12-021-12/+13
| | | | | | | | | | | If the qApp we have is in fact not a QGuiApplication we cannot connect those signals. The "if (qApp)" was probably supposed to check for this but actually doesn't because qApp is a static_cast. Change-Id: Iaa30e3d56768e97601d51d30500fc3b12d0626a3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 8a555cc22afb93dbe0e0da83f211c6e4f032bd09) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-021-2/+2
| | | | | Change-Id: Iad4966c7b0b57f9105304475e4406cf967a4b93a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-011-2/+2
| | | | | Change-Id: I648d60de9693a24c3e33b163857b9eb8f0def217 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix documentation links to High DPI documentationAndreas Buhr2020-12-011-1/+1
| | | | | | | | | | | | The documentation on High DPI was recently rewritten, renaming several sections. This patch fixes the links which were broken by this change. Task-number: QTBUG-88533 Change-Id: I30c1f801f93773e04f85d7ebb3603fafa8f4f2a0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ff7c11c481a57beeea4be2c6fbe8eea78c7b3de2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-011-2/+2
| | | | | Change-Id: I0524e8019798dfcca2c116b64c61b59b40df7bcc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-12-011-2/+2
| | | | | Change-Id: Ia4d828db1f4a5b4f3ab345a7db46c205ab6e0579 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtdeclarativeQt Submodule Update Bot2020-11-301-2/+2
| | | | | Change-Id: Id90985738cbfb52b75e4318ad2601bc5de01aab1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Allow parent to filter out-of-bounds synth-mouse for grabbing handlerShawn Rutledge2020-11-307-45/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider Flickable { Text { TapHandler { gesturePolicy: TapHandler.ReleaseWithinBounds } } } On press, TapHandler gets the exclusive grab. Now drag vertically. The Text is short in stature, so your finger soon strays out of bounds of the Text, likely before you have dragged past the drag threshold. In this case, we want Flickable to continue to filter the move events because of the fact that TapHandler is the grabber. If it was a MouseArea instead of a TapHandler, it already worked that way; so this makes behavior of handlers more consistent with that. More specifically: QQuickPointerTouchEvent::touchEventForItem() now generates a touch event even if the touchpoint is not within the bounds of the given item, but is grabbed by one of that item's handlers. Until now, we had that exception only if it was grabbed by the item itself. tst_FlickableInterop::touchAndDragHandlerOnFlickable now always drags the delegate at index 2 (the third one) from its upper-right corner, upwards and to the left. The first drag goes outside the delegate's bounds, but the Flickable/ListView/TableView filters and takes over anyway (on the next drag), to prove that it is correctly depending on the grab that the TapHandler (or DragHandler) took on press. Fixes: QTBUG-75223 Change-Id: Ie4e22c87be0af9aa3ff0146067b7705949b15c40 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1e1674849a89db54cdbcc4e995300e3ec1624c3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Porting guide: Document URL resolution changeFabian Kosmale2020-11-301-0/+22
| | | | | | | | Task-number: QTBUG-88965 Change-Id: Ib62082935ddba7bf5b359a32712e6799b3242091 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e2a74579850d89d229dad918404a8d8ecebb80b3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 03:31:26 +0000