From 72c328809078f29aa87018305af7a1f8f8dd0b93 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 12 Jul 2018 23:25:33 +0200 Subject: [PATCH] Disabled thread local storage test for Qt <4.7 because this class is broken with an int argument on Qt 4.6.2 --- src/tl/unit_tests/tlThreads.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/tl/unit_tests/tlThreads.cc b/src/tl/unit_tests/tlThreads.cc index 11daeadbd..82301eeeb 100644 --- a/src/tl/unit_tests/tlThreads.cc +++ b/src/tl/unit_tests/tlThreads.cc @@ -199,6 +199,9 @@ TEST(2_nonlocked) EXPECT_EQ (my_thread.value () < 20000000, true); } +// NOTE: ThreadStorage is broken on Qt 4.6.2 (invalid static_cast from type 'void*' to type 'int') +#if !defined(HAVE_QT) || QT_VERSION >= 0x40700 + static tl::ThreadStorage s_tls; class MyThread3 : public tl::Thread @@ -242,6 +245,8 @@ TEST(3) EXPECT_EQ (my_thread.value (), 10000000); } +#endif + static tl::WaitCondition s_condition; static tl::Mutex s_wait_mutex;