diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2024-02-02 10:23:01 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2024-02-06 08:26:06 +0100 |
| commit | 385a24c1b244e07ddb65c9b8449b8255c7e3231d (patch) | |
| tree | 0cc7c35924413a03caf8d3a4734ca91bc746643e | |
| parent | 986d5395bd8542c181298faf4916ac5d6f9c6ce1 (diff) | |
Fix ubsan build of qtdeclarative
Avoid using private classes when not exported
Pick-to: 6.7
Change-Id: Ia2dd8019719739a2cb66a0770f0156ab711a2dd8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/quicktestutils/quick/viewtestutils.cpp | 2 | ||||
| -rw-r--r-- | src/quicktestutils/quick/viewtestutils_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/quicktestutils/quick/viewtestutils.cpp b/src/quicktestutils/quick/viewtestutils.cpp index 79c34168e5..5f5f7e7648 100644 --- a/src/quicktestutils/quick/viewtestutils.cpp +++ b/src/quicktestutils/quick/viewtestutils.cpp @@ -394,7 +394,7 @@ void QQuickViewTestUtils::StressTestModel::updateModel() } } -#if QT_CONFIG(quick_itemview) +#if QT_CONFIG(quick_itemview) && defined(QT_BUILD_INTERNAL) bool QQuickViewTestUtils::testVisibleItems(const QQuickItemViewPrivate *priv, bool *nonUnique, FxViewItem **failItem, int *expectedIdx) { QHash<QQuickItem*, int> uniqueItems; diff --git a/src/quicktestutils/quick/viewtestutils_p.h b/src/quicktestutils/quick/viewtestutils_p.h index 28666786f0..6c73809846 100644 --- a/src/quicktestutils/quick/viewtestutils_p.h +++ b/src/quicktestutils/quick/viewtestutils_p.h @@ -168,7 +168,7 @@ namespace QQuickViewTestUtils int m_rowCount; }; -#if QT_CONFIG(quick_itemview) +#if QT_CONFIG(quick_itemview) && defined(QT_BUILD_INTERNAL) [[nodiscard]] bool testVisibleItems(const QQuickItemViewPrivate *priv, bool *nonUnique, FxViewItem **failItem, int *expectedIdx); #endif diff --git a/tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp index 8d42cf5faf..92c6f1383b 100644 --- a/tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp +++ b/tests/auto/quickcontrols/qquickiconlabel/tst_qquickiconlabel.cpp @@ -308,6 +308,7 @@ void tst_qquickiconlabel::colorChanges() void tst_qquickiconlabel::iconSourceContext() { +#if defined(QT_BUILD_INTERNAL) QQmlEngine engine; QQmlComponent component(&engine, testFileUrl("iconSourceContext.qml")); QVERIFY2(component.isReady(), qPrintable(component.errorString())); @@ -337,7 +338,7 @@ void tst_qquickiconlabel::iconSourceContext() = static_cast<QQuickImagePrivate *>(QQuickItemPrivate::get(image)); QCOMPARE(imagePrivate->pix.url(), testFileUrl("a.png")); } - +#endif } QTEST_MAIN(tst_qquickiconlabel) |