diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index b3f68a5c8b..99eae8553f 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -377,8 +377,8 @@ inline char *toString(const std::pair &pair) return formatString("std::pair(", ")", 2, first.data(), second.data()); } -template -inline char *toString(const Tuple & tuple, QtPrivate::IndexesList) { +template +inline char *tupleToString(const Tuple &tuple, std::index_sequence) { using UP = std::unique_ptr; // Generate a table of N + 1 elements where N is the number of // elements in the tuple. @@ -392,8 +392,7 @@ inline char *toString(const Tuple & tuple, QtPrivate::IndexesList) { template inline char *toString(const std::tuple &tuple) { - static const std::size_t params_count = sizeof...(Types); - return toString(tuple, typename QtPrivate::Indexes::Value()); + return tupleToString(tuple, std::make_index_sequence{}); } inline char *toString(std::nullptr_t) diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc index f692b98491..5776177cf6 100644 --- a/src/testlib/qtestcase.qdoc +++ b/src/testlib/qtestcase.qdoc @@ -1622,12 +1622,6 @@ Returns a textual representation of the key sequence \a ks. */ -/*! - \fn template char *QTest::toString(const Tuple &tuple, QtPrivate::IndexesList ) - \internal - \since 5.12 -*/ - /*! \fn QPointingDevice * QTest::createTouchDevice(QInputDevice::DeviceType devType = QInputDevice::DeviceType::TouchScreen, QInputDevice::Capabilities caps = QInputDevice::Capability::Position) \since 5.8