aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qmltest/quicktest.cpp2
-rw-r--r--src/qmltest/quicktest.h8
-rw-r--r--src/quickcontrolstestutils/controlstestutils.cpp2
-rw-r--r--src/quickcontrolstestutils/controlstestutils_p.h4
4 files changed, 10 insertions, 6 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index c5be20ef06..28dec95df7 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -748,7 +748,7 @@ int quick_test_main_with_setup(int argc, char **argv, const char *name, const ch
\include macro-usage-limitation.qdocinc
*/
-QByteArray QQuickTest::qActiveFocusFailureMessage(const QQuickItem *item)
+QByteArray QQuickTest::Private::qActiveFocusFailureMessage(const QQuickItem *item)
{
QByteArray message;
QDebug debug(&message);
diff --git a/src/qmltest/quicktest.h b/src/qmltest/quicktest.h
index 6d3b277023..90ed3a973b 100644
--- a/src/qmltest/quicktest.h
+++ b/src/qmltest/quicktest.h
@@ -80,20 +80,22 @@ Q_QMLTEST_EXPORT bool qIsPolishScheduled(const QQuickWindow *window);
Q_QMLTEST_EXPORT bool qWaitForPolish(const QQuickItem *item, int timeout = defaultTimeout);
Q_QMLTEST_EXPORT bool qWaitForPolish(const QQuickWindow *window, int timeout = defaultTimeout);
+namespace Private {
// These are "private" functions that we need in the public macros and hence
// can't live in private headers. This is the same as what qtestcase.h does with e.g. qCaught.
// controlstestutils_p.h has an overload for QQuickPopup.
[[nodiscard]] Q_QMLTEST_EXPORT QByteArray qActiveFocusFailureMessage(const QQuickItem *item);
-}
+} // namespace Private
+} // namespace QQuickTest
#define QVERIFY_ACTIVE_FOCUS(item) \
do { \
- QVERIFY2(item->hasActiveFocus(), QQuickTest::qActiveFocusFailureMessage(item).constData()); \
+ QVERIFY2(item->hasActiveFocus(), QQuickTest::Private::qActiveFocusFailureMessage(item).constData()); \
} while (false)
#define QTRY_VERIFY_ACTIVE_FOCUS(item) \
do { \
- QTRY_VERIFY2(item->hasActiveFocus(), QQuickTest::qActiveFocusFailureMessage(item).constData()); \
+ QTRY_VERIFY2(item->hasActiveFocus(), QQuickTest::Private::qActiveFocusFailureMessage(item).constData()); \
} while (false)
QT_END_NAMESPACE
diff --git a/src/quickcontrolstestutils/controlstestutils.cpp b/src/quickcontrolstestutils/controlstestutils.cpp
index c7143621e6..d021b8b6d5 100644
--- a/src/quickcontrolstestutils/controlstestutils.cpp
+++ b/src/quickcontrolstestutils/controlstestutils.cpp
@@ -224,7 +224,7 @@ bool QQuickControlsTestUtils::arePopupWindowsSupported()
#endif
}
-QByteArray QQuickTest::qActiveFocusFailureMessage(QQuickPopup *popup)
+QByteArray QQuickTest::Private::qActiveFocusFailureMessage(QQuickPopup *popup)
{
QByteArray message;
QDebug debug(&message);
diff --git a/src/quickcontrolstestutils/controlstestutils_p.h b/src/quickcontrolstestutils/controlstestutils_p.h
index f1fb1074be..8d356d624c 100644
--- a/src/quickcontrolstestutils/controlstestutils_p.h
+++ b/src/quickcontrolstestutils/controlstestutils_p.h
@@ -112,9 +112,11 @@ namespace QQuickControlsTestUtils
namespace QQuickTest
{
+namespace Private {
// Overload of the one in quicktest.h.
[[nodiscard]] QByteArray qActiveFocusFailureMessage(QQuickPopup *popup);
-}
+} // namespace Private
+} // namespace QQuickTest
#define VERIFY_VISUAL_FOCUS(control) \
do { \