summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/tools
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2021-12-08 14:34:25 +0100
committerThiago Macieira <thiago.macieira@intel.com>2021-12-10 13:48:37 +0000
commit48b75def5d734d8f8ecf2805ba64be6c99aca978 (patch)
treed4b7f1a882ce3212cc70b0f2bcb382f01262744f /tests/auto/corelib/tools
parent7024e7a62701f99dc2adf519ec2a3ce9d5d7920b (diff)
QList: fix typo in QList(It, It)
Remove scaffolding in the test again. [ChangeLog][QtCore][QList] Fixed a regression that caused the range constructor to fail for pure input_iterator's. Pick-to: 6.2 Fixes: QTBUG-99036 Change-Id: I72d01a9c44c3862c335d96538f26a453b4c7c554 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/tools')
-rw-r--r--tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
index c6090fa671..7fe1dd9b4d 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
+++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
@@ -66,13 +66,6 @@ std::istream &operator>>(std::istream &os, QChar &c)
}
QT_END_NAMESPACE
-namespace {
-template <typename T>
-struct is_qlist : std::false_type {};
-template <typename T>
-struct is_qlist<QList<T>> : std::true_type {};
-}
-
struct Movable
{
explicit Movable(int i = 0) noexcept
@@ -458,11 +451,6 @@ void tst_ContainerApiSymmetry::ranged_ctor_non_associative_impl() const
// from stringsteam (= pure input_iterator)
const Container c5 = [&] {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) // QTBUG-99036
- if constexpr (is_qlist<Container>::value) {
- return c4;
- } else
-#endif
{
std::stringstream ss;
for (auto &v : values1)