diff options
author | Tarja Sundqvist <[email protected]> | 2025-06-03 13:43:35 +0300 |
---|---|---|
committer | Tarja Sundqvist <[email protected]> | 2025-06-03 13:43:35 +0300 |
commit | 0f0972d542d9869c2dcfaf9c963d42ff32766460 (patch) | |
tree | f283360ffbf0453e04a321e01f0c3df1c07df3e3 /src/quicktestutils/quick | |
parent | 07e23b0f4983631524716f034c0268fd11d037f9 (diff) | |
parent | ff0a47c8f267e905113b82c53af2742027f0eca6 (diff) |
Merge tag 'v6.5.6-lts-lgpl' into 6.56.5
Qt 6.5.6-lts-lgpl release
Diffstat (limited to 'src/quicktestutils/quick')
-rw-r--r-- | src/quicktestutils/quick/geometrytestutils.cpp | 2 | ||||
-rw-r--r-- | src/quicktestutils/quick/geometrytestutils_p.h | 2 | ||||
-rw-r--r-- | src/quicktestutils/quick/viewtestutils.cpp | 2 | ||||
-rw-r--r-- | src/quicktestutils/quick/viewtestutils_p.h | 2 | ||||
-rw-r--r-- | src/quicktestutils/quick/visualtestutils.cpp | 10 | ||||
-rw-r--r-- | src/quicktestutils/quick/visualtestutils_p.h | 4 |
6 files changed, 14 insertions, 8 deletions
diff --git a/src/quicktestutils/quick/geometrytestutils.cpp b/src/quicktestutils/quick/geometrytestutils.cpp index 42fc66608a..2fe1138fbd 100644 --- a/src/quicktestutils/quick/geometrytestutils.cpp +++ b/src/quicktestutils/quick/geometrytestutils.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "geometrytestutils_p.h" diff --git a/src/quicktestutils/quick/geometrytestutils_p.h b/src/quicktestutils/quick/geometrytestutils_p.h index 46cdc78cc0..605dfd9027 100644 --- a/src/quicktestutils/quick/geometrytestutils_p.h +++ b/src/quicktestutils/quick/geometrytestutils_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef QQUICKGEOMETRYTESTUTIL_P_H #define QQUICKGEOMETRYTESTUTIL_P_H diff --git a/src/quicktestutils/quick/viewtestutils.cpp b/src/quicktestutils/quick/viewtestutils.cpp index db30cedd3e..79c34168e5 100644 --- a/src/quicktestutils/quick/viewtestutils.cpp +++ b/src/quicktestutils/quick/viewtestutils.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "viewtestutils_p.h" diff --git a/src/quicktestutils/quick/viewtestutils_p.h b/src/quicktestutils/quick/viewtestutils_p.h index 4ee9744545..28666786f0 100644 --- a/src/quicktestutils/quick/viewtestutils_p.h +++ b/src/quicktestutils/quick/viewtestutils_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef QQUICKVIEWTESTUTILS_P_H #define QQUICKVIEWTESTUTILS_P_H diff --git a/src/quicktestutils/quick/visualtestutils.cpp b/src/quicktestutils/quick/visualtestutils.cpp index 07090f1165..30b6bf1135 100644 --- a/src/quicktestutils/quick/visualtestutils.cpp +++ b/src/quicktestutils/quick/visualtestutils.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "visualtestutils_p.h" @@ -111,7 +111,13 @@ void QQuickVisualTestUtils::PointLerper::move(int x, int y, int steps, int delay move(QPoint(x, y), steps, delayInMilliseconds); }; -bool QQuickVisualTestUtils::delegateVisible(QQuickItem *item) +/*! + \internal + + Returns \c true if \c {item->isVisible()} returns \c true, and + the item is not culled. +*/ +bool QQuickVisualTestUtils::isDelegateVisible(QQuickItem *item) { return item->isVisible() && !QQuickItemPrivate::get(item)->culled; } diff --git a/src/quicktestutils/quick/visualtestutils_p.h b/src/quicktestutils/quick/visualtestutils_p.h index bf29ce73ec..60837d8f65 100644 --- a/src/quicktestutils/quick/visualtestutils_p.h +++ b/src/quicktestutils/quick/visualtestutils_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef QQUICKVISUALTESTUTILS_P_H #define QQUICKVISUALTESTUTILS_P_H @@ -60,7 +60,7 @@ namespace QQuickVisualTestUtils QPoint mFrom; }; - [[nodiscard]] bool delegateVisible(QQuickItem *item); + [[nodiscard]] bool isDelegateVisible(QQuickItem *item); /* Find an item with the specified objectName. If index is supplied then the |