1 files changed, 70 insertions, 2 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 80e6d93193..b34086c8ad 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -324,6 +324,37 @@ linkat(AT_FDCWD, \"foo\", AT_FDCWD, \"bar\", AT_SYMLINK_FOLLOW);
 }
 ")
 
+# memmem
+qt_config_compile_test(memmem
+    LABEL "memmem()"
+    CODE
+#define _APPLE_SAUCE 1  /* Apple doesn't require anything */
+"#define _BSD_SOURCE 1   /* For FreeBSD */
+#define _GNU_SOURCE 1   /* For glibc, Bionic */
+#include <string.h>
+
+int main(void)
+{
+    const void *r = memmem(\"abc\", 3, \"bc\", 2);
+    (void)r;
+    return 0;
+}")
+
+# memrchr
+qt_config_compile_test(memrchr
+    LABEL "memrchr()"
+    CODE
+"#define _BSD_SOURCE 1   /* For FreeBSD */
+#define _GNU_SOURCE 1   /* For glibc, Bionic */
+#include <string.h>
+
+int main(void)
+{
+    const void *r = memrchr(\"abc\", 'a', 3);
+    (void)r;
+    return 0;
+}")
+
 # ppoll
 qt_config_compile_test(ppoll
     LABEL "ppoll()"
@@ -430,6 +461,34 @@ const auto backtrace = std::stacktrace::current();
     CXX_STANDARD 23
 )
 
+# <future>
+qt_config_compile_test(cxx_std_async_noncopyable
+    LABEL "std::async() NonCopyable"
+    CODE
+"// Calling std::async with lambda which takes non-copyable argument causes compilation error on
+// some platforms (VxWorks 24.03 and older with C++17-compatibility for example)
+#include <future>
+
+class NonCopyable {
+public:
+    NonCopyable(const NonCopyable&) = delete;
+    NonCopyable(NonCopyable&&) = default;
+
+    NonCopyable(int value)
+        :value (value)
+    {}
+
+    int value;
+};
+
+int main(int argc, char** argv) {
+    return std::async(
+        std::launch::deferred,
+        [](NonCopyable value) { return value.value; },
+        NonCopyable(argc - 1)).get();
+}
+")
+
 #### Features
 
 qt_feature("clock-gettime" PRIVATE
@@ -458,7 +517,7 @@ qt_feature("system-doubleconversion" PRIVATE
 )
 qt_feature("cxx11_future" PUBLIC
     LABEL "C++11 <future>"
-    CONDITION NOT VXWORKS
+    CONDITION TEST_cxx_std_async_noncopyable
 )
 qt_feature("cxx17_filesystem" PUBLIC
     LABEL "C++17 <filesystem>"
@@ -526,6 +585,14 @@ qt_feature("std-atomic64" PUBLIC
     LABEL "64 bit atomic operations"
     CONDITION WrapAtomic_FOUND
 )
+qt_feature("memmem" PRIVATE
+    LABEL "C library function memmem()"
+    CONDITION TEST_memmem
+)
+qt_feature("memrchr" PRIVATE
+    LABEL "C library function memrchr()"
+    CONDITION TEST_memrchr
+)
 qt_feature("mimetype" PUBLIC
     SECTION "Utilities"
     LABEL "Mimetype handling"
@@ -832,7 +899,8 @@ qt_feature("timezone_locale" PRIVATE
     SECTION "Utilities"
     LABEL "QTimeZone"
     PURPOSE "Provides support for localized time-zone display names."
-    DISABLE ON # Implementation is currently incomplete, so leave turned off
+    CONDITION
+        QT_FEATURE_timezone AND ( ( UNIX AND NOT APPLE AND NOT ANDROID ) OR QT_FEATURE_icu )
 )
 qt_feature("datetimeparser" PRIVATE
     SECTION "Utilities"