aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickpathview
Commit message (Collapse)AuthorAgeFilesLines
* Tests: include QTest, not QtTestGiuseppe D'Angelo2025-04-151-1/+1
| | | | | | | | | | | | | Never use module-wide inclusions. They blow up build times. For QtTest this is usually just a typo (QTest was meant instead). Add missing includes as needed. In the diffs I've spotted other huge inclusions (QtQuick, QtQml), but those need more attention. Task-number: QTQAINFRA-7110 Pick-to: 6.9 6.8 Change-Id: I74bf3fe212f50a7a3a6af2b1c80bbcaabc2516d7 Reviewed-by: Fabian Kosmale <[email protected]>
* Port away from QPairZhao Yuhang2025-04-121-4/+4
| | | | | | | | QPair is just an alias of std::pair anyway. Task-number: QTBUG-115841 Change-Id: I26fc90adcc775aac9955ad57304af914dc4ed48f Reviewed-by: Ulf Hermann <[email protected]>
* tests: Swap QScopedPointer<QPointingDevice> for unique_ptr touchscreenShawn Rutledge2025-03-291-5/+5
| | | | | | | | | | | | The default device from QTest::createTouchDevice() is a touchscreen, so we should call it that, to disambiguate touchpads (a few tests use them). And QScopedPointer is discouraged nowadays. Task-number: QTBUG-132212 Pick-to: 6.8 6.9 Change-Id: I2aeaf8cee3c7b6041945506e11fa62d7c923c556 Reviewed-by: Axel Spoerl <[email protected]> Reviewed-by: Frederic Lefebvre <[email protected]>
* Add Qt::Qml before Qt::QmlPrivate to auto testsKarim Pinter2024-10-221-0/+1
| | | | | | | | | | The build for auto tests for VxWorks fails because Qt::Qml is not added before Qt::QmlPrivate resulting in many unresolved symbols from Qt::Qml library. When Qt::Qml is added before it solves this problem. Task-number: QTBUG-129113 Change-Id: I89d553ac1d6706e2e934665fed2f308e6b01ed78 Reviewed-by: Ulf Hermann <[email protected]>
* Replace mouse-only flick, moveAndPress, moveAndRelease in testsShawn Rutledge2024-07-021-9/+15
| | | | | | | | | | | Since d7623d79ef4bc9533fced027bf1d173d68b4eba6 Flickable has worked directly with touch events; and we are expected to have stylus devices (QTabletEvents) working well too. So we need to be able to expand the test coverage to more types of devices. This is the first step. Pick-to: 6.8 Change-Id: I93a3a4b84424eb69e0cd7c9f4ebe58b9f27082d9 Reviewed-by: Shawn Rutledge <[email protected]>
* Tests: Avoid some warningsUlf Hermann2024-06-111-2/+2
| | | | | | Change-Id: I463e41352467dab7998b79843547a4a05046520c Reviewed-by: Fabian Kosmale <[email protected]> Reviewed-by: Olivier De Cannière <[email protected]>
* Replace all occurrences of Q_OS_MAC with more appropriate definesTor Arne Vestbø2024-06-041-1/+1
| | | | | | Pick-to: 6.8 Change-Id: I6ea24d0439c78efbb1df242fb980d3d8b084eeb2 Reviewed-by: Volker Hilsheimer <[email protected]>
* Make sure PathView index isn't negative when filling the modelKaj Grönholm2024-04-122-0/+91
| | | | | | | Pick-to: 6.7 6.5 Fixes: QTBUG-46487 Change-Id: Iba2a875756f0c06b86bb0a0aaf66eac329b2382b Reviewed-by: Santhosh Kumar <[email protected]>
* Fix PathView infinite create/remove loopsKaj Grönholm2024-04-123-0/+92
| | | | | | | | | | | | | | | | | | | | | | Avoid PathView getting into infinite create/remove loops with two improvements: - Don't allow cacheSize to be bigger than the amount of invisible items. This fixes cases where cacheSize has been set to be too big (QTBUG-50540, QTBUG-59108, QTBUG-42504). - Don't do empty range check when appending items. This fixes the issue with specific model sizes & pathItemCount combinations (QTBUG-90479). Includes new autotests for these cases. Pick-to: 6.7 Task-number: QTBUG-90479 Task-number: QTBUG-42504 Task-number: QTBUG-59108 Task-number: QTBUG-50540 Change-Id: Ib2caa21ec2bd2e9ca87a5be24306a539a0f66191 Reviewed-by: Kaj Grönholm <[email protected]> Reviewed-by: Tomi Korpipää <[email protected]> Reviewed-by: Santhosh Kumar <[email protected]>
* Correct license for test filesLucie Gérard2024-02-277-7/+7
| | | | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I26d72e8de04d4c7c57b3b7838af5d033265de5ba Reviewed-by: Shawn Rutledge <[email protected]> Reviewed-by: Kai Köhne <[email protected]> Reviewed-by: Ulf Hermann <[email protected]>
* Accept mouse event if grabbed after filtering in PathViewSanthosh Kumar2023-11-232-0/+104
| | | | | | | | | | | | | | After PathView is flicked, it can be stopped by a mouse press. Normally, it filters mouse events to control the movement within the view. The press after flick is grabbed and consumed to stop movement; but it didn't accept this event, so delivery was continuing to other items beneath. Now we accept the mouse press so that QQuickDeliveryAgent stops propagating it. Fixes: QTBUG-115121 Pick-to: 6.6 6.5 Change-Id: Id4119b94c004883ff40d728f78b1af729290f331 Reviewed-by: Shawn Rutledge <[email protected]>
* Remove remaining foreach in quick testsUlf Hermann2023-08-231-7/+6
| | | | | | | Task-number: QTBUG-115808 Change-Id: I30c27cf9972257897f15d57d62ff05ad1028b35e Reviewed-by: Sami Shalayel <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
* Mark the module as free of Q_FOREACH, except where it isn'tMarc Mutz2023-08-171-0/+2
| | | | | | | | | | | | | | | | | | | The density of Q_FOREACH uses is high here, too high for this author, unfamiliar with this code, to tackle in a short amount of time. But they're concentrated in just a few TUs, so pick a different strategy: Mark the whole module with QT_NO_FOREACH, to prevent new uses from creeping in, and whitelist the affected TUs by #undef'ing QT_NO_FOREACH locally, at the top of each file. For TUs that are part of a larger executable, this requires these files to be compiled separately, so add them to NO_PCH_SOURCES (which implies NO_UNITY_BUILD_SOURCES, too). Created QTBUG-115808 to keep track of this. Task-number: QTBUG-115808 Change-Id: I29c377f939e3d747e3ce72c224c4ee722df7a95d Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Fabian Kosmale <[email protected]>
* CMake: Make quick tests standalone projectsAlexandru Croitor2023-07-051-0/+6
| | | | | | | | | | | | | | | | | Add the boilerplate standalone test prelude to each test, so that they can be opened with an IDE without the qt-cmake-standalone-test script, but directly with qt-cmake or cmake. Boilerplate was added using the follow script: https://git.qt.io/alcroito/cmake_refactor Manual adjustments were made where the code was inserted in the wrong location. Task-number: QTBUG-93020 Change-Id: I7854e7f015535a4835ce3daf816f7f33aa242c2a Reviewed-by: Amir Masoud Abdol <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
* Retire the qt_parse_all_argumentsAmir Masoud Abdol2023-01-201-2/+2
| | | | | | Task-number: QTBUG-99238 Change-Id: Ia11c9cbd7c06347319ab3674ec0cd8da0214747e Reviewed-by: Alexandru Croitor <[email protected]>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-071-2/+2
| | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I601bf70f020f511019ed28731ba53b14b765dbf0 Reviewed-by: Shawn Rutledge <[email protected]>
* Port from container::count() and length() to size()Marc Mutz2022-10-071-162/+162
| | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7 Reviewed-by: Fabian Kosmale <[email protected]>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-09-071-1/+1
| | | | | | | Task-number: QTBUG-105718 Change-Id: Id89ed14990804a5024183e75382cc539d4293da1 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Jörg Bornemann <[email protected]>
* Use the time stamp of the touch event when deliver touch as mouseSeokha Ko2022-08-261-0/+110
| | | | | | | | | | Use the time stamp of the touch event when converting a touch event to a mouse event for items that do not handle touch events Fixes: QTBUG-105907 Pick-to: 6.2 6.3 6.4 Change-Id: I642093346459a031b77174eeecba8470e103e8dc Reviewed-by: Shawn Rutledge <[email protected]>
* CMake: Don't use PUBLIC_LIBRARIES for tests and test helpersAlexandru Croitor2022-07-281-2/+2
| | | | | Change-Id: I1cd769f85d5f82c43639d6787d98e536619249e6 Reviewed-by: Alexey Edelev <[email protected]>
* Avoid qWaitForWindowActivated() in tst_qquickpathviewUlf Hermann2022-07-181-53/+19
| | | | | | | | | There are platforms that don't support window activation. On such platforms the test would needlessly fail. Pick-to: 6.2 6.3 6.4 Change-Id: I0dfcba892643cd254ce4987b1a09e494063035ed Reviewed-by: Mitch Curtis <[email protected]>
* Add license headers to cmake filesLucie Gérard2022-07-081-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I72c89a98c42bbc9234d8495e9e503bec81d11037 Reviewed-by: Jörg Bornemann <[email protected]>
* Use SPDX license identifiersLucie Gérard2022-06-117-321/+14
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <[email protected]>
* QtQuickTest: add API for checking for polish at window levelMitch Curtis2022-06-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a qIsPolishScheduled(QQuickWindow *) overload of qIsPolishScheduled(QQuickItem *) (added in 40d6072bc8a4df0fe1a16025fe30fe653463a446) and deprecates qWaitForItemPolished() (added in 7a3cad0619662b992154e075ec6b840bfc8a46a7) in favor of qWaitForPolish(), which has QQuickItem* and QQuickWindow* overloads. The existing functions that take QQuickItem are useful, but testing Qt Quick applications can be made even easier by allowing users to check if a window has any items that need to be polished. This information is already present (in QQuickWindowPrivate::itemsToPolish), so it's very efficient to check for. This is especially useful now that Qt Quick Layouts using polishing for their layouting, for example, as it's no longer necessary to find individual polishable items in complex hierarchies before proceeding to interact with child items. [ChangeLog][QtQuickTest][QQuickTest] Added QQuickTest::qIsPolishScheduled(QQuickWindow *) and QQuickTest::qWaitForPolish(QQuickWindow *) functions for verifying that updatePolish() was called on one or more items managed by a window. [ChangeLog][QtQuickTest][QQuickTest] Deprecated QQuickTest::qWaitForItemPolished(QQuickItem *). Use the new QQuickTest::qWaitForPolish(QQuickItem *) function instead. Fixes: QTBUG-93757 Change-Id: I95b6e051b3c9fd2fa93604f4d9ccda486bb29f9d Reviewed-by: Richard Moe Gustavsen <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
* Cleanup CMakeLists.txt filesAndreas Buhr2022-05-031-2/+0
| | | | | | | | | A lot of CMakeLists.txt files defined QT_QMLTEST_DATADIR twice, leading to a warning. This patch fixes these. Pick-to: 6.2 6.3 Change-Id: I8b835fcddd3334f0ecac45cb72bd5763b3a5704d Reviewed-by: Fabian Kosmale <[email protected]>
* DelegateModel: Use actual bindings for required propertiesUlf Hermann2022-04-111-1/+0
| | | | | | | | | | | | | Tracking the change signals is brittle and error prone. We have bindings for this case. Let's use them. We can construct a synthetic QV4::Function that contains its own QQmlJSAotFunction. In order to pass the property index to the function we generalize the "index" property of QQmlJSAotFunction to contain any extra data the function may want to use. If there is no compilation unit, we pass that instead. Fixes: QTBUG-91649 Change-Id: I0758bcc4964a48c6818d18bfb0972e67dbc16a1f Reviewed-by: Fabian Kosmale <[email protected]>
* Do not rely on transitive includes in testsFabian Kosmale2022-02-141-0/+1
| | | | | Change-Id: Icb68dbecab6f675352cd58333c82fa6648025367 Reviewed-by: Ulf Hermann <[email protected]>
* Stop using deprecated QMouseEvent and QContextMenuEvent ctorsShawn Rutledge2022-02-101-3/+6
| | | | | | | Needed after qtbase 6b2c9b81afdb3d1d9b7a2e87819e9545b14810f3 Change-Id: I117cd4d09b4219ddc97dd019419b4b971f9dbb8e Reviewed-by: Volker Hilsheimer <[email protected]>
* Un-blacklist some passing testsShawn Rutledge2022-02-051-3/+0
| | | | | | | | | | | | | | | Task-number: QTBUG-75786 Task-number: QTBUG-82015 Task-number: QTBUG-82043 Task-number: QTBUG-82404 Task-number: QTBUG-85622 Task-number: QTBUG-85624 Task-number: QTBUG-88541 Task-number: QTBUG-95863 Pick-to: 6.2 6.3 Change-Id: I361afa8b78e2947b12194b6b1212e59db1b20b11 Reviewed-by: Fabian Kosmale <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
* Consolidate test helpers into private librariesMitch Curtis2021-09-132-22/+18
| | | | | | | | | | | | | | | | | | | | Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <[email protected]>
* Blacklist tst_qquickpathview::snapOneItem() on macosUlf Hermann2021-08-171-0/+3
| | | | | | | | See https://testresults.qt.io/grafana/d/5GKDJSPZz/02-qt-framework-please-fix-these-flaky-tests-random-fails?from=1613569036921&to=1629203836922&var-branch=dev&var-project=qt%2Fqtdeclarative&var-testcase=tst_qquickpathview&var-testfunction=snapOneItem&orgId=1&var-inter=24h Task-number: QTBUG-95863 Change-Id: Ie3911784176f6058810ed4ac4b54ca8454fe809b Reviewed-by: Mitch Curtis <[email protected]>
* QQuickItem change contains function behaviorIgor Bugaev2021-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | QQuickItem::contains() and QQuickItem::childAt() were different: QQuickItem::contains() included edges, but QQuickItem::childAt() did not. Because of this, it is impossible to replace the condition at QQuickItem::childAt() function whether the point belongs to an item, to function QQuickItem::contains() (this is necessary to start using containment mask), without breaking the childAt function, because it would start to consider the edges. This change prohibits delivery of events to zero-size items, and fixes the case when the same point could otherwise be inside multiple items: for example (0,0,10,10), (10,10,20,20) and the point (10,10). [ChangeLog][Important Behavior Changes][QQuickItem] Item.contains() now checks for coordinates less than the width and height, for consistency with childAt(), and because the item is drawn from (0,0) to (width-1, height-1). Pick-to: 6.2 Fixes: QTBUG-55958 Change-Id: I1556cc14038cef4d2a6bb1ab7d28aa449cfd7a25 Reviewed-by: Mitch Curtis <[email protected]>
* Remove the qmake project filesFabian Kosmale2021-01-151-13/+0
| | | | | | | | | Remove all qmake project files, except for examples which are used to test that qmake continues to work. Change-Id: Ic4abb72dc2dcd75df7a797c56056b6b3c5fe62ac Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Ulf Hermann <[email protected]>
* Fix tests that used out-of-context mouse grabsShawn Rutledge2020-11-172-5/+4
| | | | | | | | | | QQuickItem::grabMouse() is deprecated, and cannot be used at all when there is no current event being delivered. But we can still use QPointingDevicePrivate::setExclusiveGrabber(). Task-number: QTBUG-86729 Change-Id: I215de471e6dc44551720bc4c766b22cdfee94423 Reviewed-by: Volker Hilsheimer <[email protected]>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-061-4/+4
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801 Reviewed-by: Cristian Adam <[email protected]>
* Un-blacklist Quick tests that are passingShawn Rutledge2020-10-061-2/+0
| | | | | | Task-number: QTBUG-86729 Change-Id: I35dc7ac91d2507a229dc1dde19f380e7111a4757 Reviewed-by: Volker Hilsheimer <[email protected]>
* Blacklist various failing testsShawn Rutledge2020-09-251-0/+2
| | | | | | | | | | | | tst_qqflickable::nestedStopAtBounds, nestedSliderUsingTouch tst_QQuickMouseArea::preventStealing, nestedFlickableStopAtBounds tst_QQuickMultiPointTouchArea::inFlickable2, inFlickableWithPressDelay tst_QQuickPathView::nestedinFlickable, touchButtonOnFlickable, touchGrabCausesMouseUngrab tst_qqmlpropertycache::derivedGadgetMethod Task-number: QTBUG-86729 Change-Id: Ie11a50c25f90fde2636b05a72f51640643b33dec Reviewed-by: Fabian Kosmale <[email protected]>
* Blacklist tests due to QPointerEvent changesShawn Rutledge2020-09-181-0/+2
| | | | | | | | | | | | | | | | qtbase/2692237bb1b0c0f50b7cc5d920eb8ab065063d47 and the associated Qt Quick change to do direct delivery of QPointerEvents seem to have broken a number of tests as they are currently written. It looks bad; however I spent a lot of time already on some older "basic" tests like tst_qquickwindow, touchmouse, tst_qquickflickable etc. and found a lot of things to fix while doing that; so at least those aren't broken now. Troubleshooting each test takes time. Hopefully it will turn out that many of these failures are related (there seems to be something in common about handlers and items stealing touch grabs from each other). Task-number: QTBUG-86729 Change-Id: I14acf57fc83fa961a25f91108dcd4aea42b54435 Reviewed-by: Shawn Rutledge <[email protected]>
* Modernize tst_QQuickPathView::treeModel()Shawn Rutledge2020-06-102-8/+12
| | | | | | | | - Don't use context properties: a singleton is better - Use required properties to declare dependendencies Change-Id: I10a0a301e0a397b1d4fc9edf804eea3499c79025 Reviewed-by: Fabian Kosmale <[email protected]>
* Fix some warnings in tst_qquickpathviewShawn Rutledge2020-06-101-9/+9
| | | | | Change-Id: I5c3c6d418fb9f35ee684d6d7c548ba468b7f262c Reviewed-by: Fabian Kosmale <[email protected]>
* Autotests: use std::atomic in incubateWhile()Shawn Rutledge2020-05-151-7/+7
| | | | | | | Followup to a9bf6e652aa99784343c94b0181c9443205e2a82 Change-Id: Ic010f2610177f93f8fc4e2312d6736c96390e585 Reviewed-by: Fabian Kosmale <[email protected]>
* CMake: Update Apple platform defines after rename in qtbaseTor Arne Vestbø2020-03-171-2/+2
| | | | | Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann <[email protected]>
* Regenerate qtdeclarativeAlexandru Croitor2020-02-121-6/+2
| | | | | | | Change-Id: I48d7fd306f3d1b161a8e73029282ee591b1ef612 Reviewed-by: Leander Beernaert <[email protected]> Reviewed-by: Simon Hausmann <[email protected]> Reviewed-by: Liang Qi <[email protected]>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2020-01-162-0/+110
|\ | | | | | | Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-052-0/+110
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquicklistview/tst_qquicklistview.cpp tests/auto/quick/qquicktableview/tst_qquicktableview.cpp Change-Id: Ib46bc1c717cf524eea2fb3d876810c8d55747c91
| | * Fix incorrect behavior of PathView with ungrabMouse()Shin-ichi Okada2019-12-042-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the grabbed Item is released and then grabbed again, if ungrabMouse () is called, the animation stops. In order to avoid this, when ungrabMouse () is called, if offset is different, it is modified to animate. Task-number: QTBUG-79592 Change-Id: I61cbd4dad90643722f12480f0dab3859ce116af8 Reviewed-by: Mitch Curtis <[email protected]>
* | | Regenerate all projects with new CMake API versionAlexandru Croitor2019-11-151-4/+4
| | | | | | | | | | | | | | | | | | Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <[email protected]>
* | | Regenerate testsAlexandru Croitor2019-11-141-11/+2
| | | | | | | | | | | | | | | | | | Change-Id: I67a6c8f1659e7b471a4fcb92a2699292cf4eea81 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <[email protected]>
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-146-0/+432
|\| | | | | | | | | | | | | | | | | | | | Removed dependencies.yaml because we don't use it yet in wip/cmake. Fixed conflict in qmlcachegen.cpp. Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-111-0/+39
| |\| | | | | | | | | | Change-Id: I1359574c7d89aaf3328958e2f667ba1e599ff7f1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-29 02:27:13 +0000