Qt6 GHA

.github/workflows/build_cmake.yml

@@ -3,14 +3,14 @@ name: CMake Build Matrix
 on:
   push:
     branches:
-      - master
+      - '*'
 
   pull_request:
     branches:
       - master
 
 env:
-  QT_VERSION: 5.15.1
+  QT_VERSION: 6.6.1
   CCACHE_VERSION: 3.7.7
   CACHE_PARTITION: dev
   HOST_N_CORES: 2
@@ -74,7 +74,7 @@ jobs:
       env:
         TOOLCHAIN: "win64_msvc2019_64"
         DIR: "msvc2019_64"
-      shell: bash --noprofile --norc -eo pipefail -x {0} 
+      shell: bash --noprofile --norc -eo pipefail -x {0}
       run: |
         py -m pip install -r Tools/qt/qt-downloader-requirements.txt
         QT_INSTALL_DIR="/c/Qt"
@@ -89,7 +89,7 @@ jobs:
       id: qt_mac
       if: runner.os == 'macOS'
       shell: bash --noprofile --norc -eo pipefail -x {0}
-      env: 
+      env:
         TOOLCHAIN: "clang_64"
       run: |
         pip3 install -r Tools/qt/qt-downloader-requirements.txt
@@ -138,7 +138,7 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         sudo apt-get update && sudo apt-get install \
-        ninja-build build-essential bison flex gperf libfontconfig1-dev libgl1-mesa-dev libglib2.0-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhyphen-dev libicu-dev libjpeg-dev libpng-dev libqt5opengl5-dev libqt5sensors5-dev libqt5webchannel5-dev libsqlite3-dev libwebp-dev libwoff-dev libxcomposite-dev libxml2-dev libxrender-dev libxslt1-dev mesa-common-dev pkg-config python3 qtbase5-private-dev qtdeclarative5-private-dev qtpositioning5-dev ruby libqt5sql5-sqlite qtbase5-doc-html qttools5-dev-tools \
+        ninja-build build-essential bison flex gperf libfontconfig1-dev libgl1-mesa-dev libglib2.0-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhyphen-dev libicu-dev libjpeg-dev libpng-dev libqt6opengl6-dev libqt6sensors6-dev libqt6webchannel6-dev libsqlite3-dev libwebp-dev libwoff-dev libxcomposite-dev libxml2-dev libxrender-dev libxslt1-dev mesa-common-dev pkg-config python3 qt6-base-dev qt6-base-private-dev qt6-declarative-private-dev qt6-positioning-dev ruby libqt6sql6-sqlite qt6-base-dev-tools \
         libtasn1-6-dev libgcrypt20-dev libunwind-dev libharfbuzz-dev
 
     - name: CMake version

.github/workflows/draft_release.yml

@@ -7,7 +7,7 @@ on:
         description: "Coin build number, e.g. 1600955993"
         required: true
       qt_version:
-        description: "Qt version used for building artifacts, e.g. 5.15.1"
+        description: "Qt version used for building artifacts, e.g. 6.6.1"
         required: true
       tag_name:
         description: "Tag name, e.g. qtwebkit-5.212.0-alpha5"

Source/JavaScriptCore/PlatformQt.cmake

@@ -15,11 +15,11 @@ list(APPEND JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
 )
 
 list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
-    ${Qt5Core_INCLUDE_DIRS}
+    ${Qt6Core_INCLUDE_DIRS}
 )
 
 list(APPEND JavaScriptCore_LIBRARIES
-    ${Qt5Core_LIBRARIES}
+    ${Qt6Core_LIBRARIES}
 )
 
 if (QT_STATIC_BUILD)

Source/PlatformQt.cmake

@@ -132,35 +132,35 @@ endmacro ()
 set(_package_footer_template "
 ####### Expanded from QTWEBKIT_PACKAGE_FOOTER variable #######
 
-set(Qt5@MODULE_NAME@_LIBRARIES Qt5::@MODULE_NAME@)
-set(Qt5@MODULE_NAME@_VERSION_STRING \${Qt5@MODULE_NAME@_VERSION})
-set(Qt5@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS \"\")
-set(Qt5@MODULE_NAME@_PRIVATE_INCLUDE_DIRS \"\") # FIXME: Support private headers
-
-get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS        Qt5::@FULL_MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@FULL_MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS)
-
-foreach (_module_dep \${_Qt5@MODULE_NAME@_MODULE_DEPENDENCIES})
-    list(APPEND Qt5@MODULE_NAME@_INCLUDE_DIRS \${Qt5\${_module_dep}_INCLUDE_DIRS})
-    list(APPEND Qt5@MODULE_NAME@_PRIVATE_INCLUDE_DIRS \${Qt5\${_module_dep}_PRIVATE_INCLUDE_DIRS})
-    list(APPEND Qt5@MODULE_NAME@_DEFINITIONS \${Qt5\${_module_dep}_DEFINITIONS})
-    list(APPEND Qt5@MODULE_NAME@_COMPILE_DEFINITIONS \${Qt5\${_module_dep}_COMPILE_DEFINITIONS})
-    list(APPEND Qt5@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS \${Qt5\${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
+set(Qt6@MODULE_NAME@_LIBRARIES Qt6::@MODULE_NAME@)
+set(Qt6@MODULE_NAME@_VERSION_STRING \${Qt6@MODULE_NAME@_VERSION})
+set(Qt6@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS \"\")
+set(Qt6@MODULE_NAME@_PRIVATE_INCLUDE_DIRS \"\") # FIXME: Support private headers
+
+get_target_property(Qt6@MODULE_NAME@_INCLUDE_DIRS        Qt6::@FULL_MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(Qt6@MODULE_NAME@_COMPILE_DEFINITIONS Qt6::@FULL_MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS)
+
+foreach (_module_dep \${_Qt6@MODULE_NAME@_MODULE_DEPENDENCIES})
+    list(APPEND Qt6@MODULE_NAME@_INCLUDE_DIRS \${Qt6\${_module_dep}_INCLUDE_DIRS})
+    list(APPEND Qt6@MODULE_NAME@_PRIVATE_INCLUDE_DIRS \${Qt6\${_module_dep}_PRIVATE_INCLUDE_DIRS})
+    list(APPEND Qt6@MODULE_NAME@_DEFINITIONS \${Qt6\${_module_dep}_DEFINITIONS})
+    list(APPEND Qt6@MODULE_NAME@_COMPILE_DEFINITIONS \${Qt6\${_module_dep}_COMPILE_DEFINITIONS})
+    list(APPEND Qt6@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS \${Qt6\${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
 endforeach ()
-list(REMOVE_DUPLICATES Qt5@MODULE_NAME@_INCLUDE_DIRS)
-list(REMOVE_DUPLICATES Qt5@MODULE_NAME@_PRIVATE_INCLUDE_DIRS)
-list(REMOVE_DUPLICATES Qt5@MODULE_NAME@_DEFINITIONS)
-list(REMOVE_DUPLICATES Qt5@MODULE_NAME@_COMPILE_DEFINITIONS)
-list(REMOVE_DUPLICATES Qt5@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS)
+list(REMOVE_DUPLICATES Qt6@MODULE_NAME@_INCLUDE_DIRS)
+list(REMOVE_DUPLICATES Qt6@MODULE_NAME@_PRIVATE_INCLUDE_DIRS)
+list(REMOVE_DUPLICATES Qt6@MODULE_NAME@_DEFINITIONS)
+list(REMOVE_DUPLICATES Qt6@MODULE_NAME@_COMPILE_DEFINITIONS)
+list(REMOVE_DUPLICATES Qt6@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS)
 
 # Fixup order of configurations to match behavior of other Qt modules
 # See also https://bugreports.qt.io/browse/QTBUG-29186
-get_target_property(_configurations Qt5::@FULL_MODULE_NAME@ IMPORTED_CONFIGURATIONS)
+get_target_property(_configurations Qt6::@FULL_MODULE_NAME@ IMPORTED_CONFIGURATIONS)
 list(FIND _configurations RELEASE _index)
 if (\${_index} GREATER -1)
     list(REMOVE_AT _configurations \${_index})
     list(INSERT _configurations 0 RELEASE)
-    set_property(TARGET Qt5::@FULL_MODULE_NAME@ PROPERTY IMPORTED_CONFIGURATIONS \"\${_configurations}\")
+    set_property(TARGET Qt6::@FULL_MODULE_NAME@ PROPERTY IMPORTED_CONFIGURATIONS \"\${_configurations}\")
 endif ()
 unset(_configurations)
 unset(_index)
@@ -169,73 +169,73 @@ unset(_index)
 set(MODULE_NAME WebKit)
 set(FULL_MODULE_NAME WebKitLegacy)
 string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY)
-ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitConfig.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitConfig.cmake"
-    INSTALL_DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit"
+ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt6WebKitConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/Qt6WebKitConfig.cmake"
+    INSTALL_DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt6WebKit"
 )
 
 set(MODULE_NAME WebKitWidgets)
 set(FULL_MODULE_NAME WebKitWidgets)
 string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY)
-ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitWidgetsConfig.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitWidgetsConfig.cmake"
-    INSTALL_DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets"
+ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt6WebKitWidgetsConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/Qt6WebKitWidgetsConfig.cmake"
+    INSTALL_DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt6WebKitWidgets"
 )
 
 unset(MODULE_NAME)
 unset(FULL_MODULE_NAME)
 unset(QTWEBKIT_PACKAGE_FOOTER)
 
-write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitConfigVersion.cmake"
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/Qt6WebKitConfigVersion.cmake"
     VERSION ${PROJECT_VERSION}
     COMPATIBILITY AnyNewerVersion)
-write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitWidgetsConfigVersion.cmake"
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/Qt6WebKitWidgetsConfigVersion.cmake"
     VERSION ${PROJECT_VERSION}
     COMPATIBILITY AnyNewerVersion)
 
 install(FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitConfig.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitConfigVersion.cmake"
-    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit"
+    "${CMAKE_CURRENT_BINARY_DIR}/Qt6WebKitConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/Qt6WebKitConfigVersion.cmake"
+    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt6WebKit"
     COMPONENT Data
 )
 install(FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitWidgetsConfig.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitWidgetsConfigVersion.cmake"
-    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets"
+    "${CMAKE_CURRENT_BINARY_DIR}/Qt6WebKitWidgetsConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/Qt6WebKitWidgetsConfigVersion.cmake"
+    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt6WebKitWidgets"
     COMPONENT Data
 )
 
 # We need to install separate config files for debug and release, so use "Code" component
 install(EXPORT WebKitTargets
     FILE WebKitTargets.cmake
-    NAMESPACE Qt5::
-    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit"
+    NAMESPACE Qt6::
+    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt6WebKit"
     COMPONENT Code
 )
-install(EXPORT Qt5WebKitWidgetsTargets
-    FILE Qt5WebKitWidgetsTargets.cmake
-    NAMESPACE Qt5::
-    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets"
+install(EXPORT Qt6WebKitWidgetsTargets
+    FILE Qt6WebKitWidgetsTargets.cmake
+    NAMESPACE Qt6::
+    DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt6WebKitWidgets"
     COMPONENT Code
 )
 
 # Documentation
 
-if (NOT TARGET Qt5::qdoc)
-    add_executable(Qt5::qdoc IMPORTED)
+if (NOT TARGET Qt6::qdoc)
+    add_executable(Qt6::qdoc IMPORTED)
     query_qmake(QDOC_EXECUTABLE QT_INSTALL_BINS)
     set(QDOC_EXECUTABLE "${QDOC_EXECUTABLE}/qdoc")
-    set_target_properties(Qt5::qdoc PROPERTIES
+    set_target_properties(Qt6::qdoc PROPERTIES
         IMPORTED_LOCATION ${QDOC_EXECUTABLE}
     )
 endif ()
 
-if (NOT TARGET Qt5::qhelpgenerator)
-    add_executable(Qt5::qhelpgenerator IMPORTED)
+if (NOT TARGET Qt6::qhelpgenerator)
+    add_executable(Qt6::qhelpgenerator IMPORTED)
     query_qmake(QHELPGENERATOR_EXECUTABLE QT_INSTALL_BINS)
     set(QHELPGENERATOR_EXECUTABLE "${QHELPGENERATOR_EXECUTABLE}/qhelpgenerator")
-    set_target_properties(Qt5::qhelpgenerator PROPERTIES
+    set_target_properties(Qt6::qhelpgenerator PROPERTIES
         IMPORTED_LOCATION ${QHELPGENERATOR_EXECUTABLE}
     )
 endif ()
@@ -272,13 +272,13 @@ set(EXPORT_VARS_COMMANDS
 
 add_custom_target(prepare_docs ${NEED_ALL}
     ${EXPORT_VARS_COMMANDS}
-    COMMAND Qt5::qdoc ${QDOC_CONFIG} -prepare -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS} -no-link-errors
+    COMMAND Qt6::qdoc ${QDOC_CONFIG} -prepare -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS} -no-link-errors
     VERBATIM
 )
 
 add_custom_target(generate_docs ${NEED_ALL}
     ${EXPORT_VARS_COMMANDS}
-    COMMAND Qt5::qdoc ${QDOC_CONFIG} -generate -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS}
+    COMMAND Qt6::qdoc ${QDOC_CONFIG} -generate -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS}
     VERBATIM
 )
 add_dependencies(generate_docs prepare_docs)
@@ -287,7 +287,7 @@ add_custom_target(html_docs)
 add_dependencies(html_docs generate_docs)
 
 add_custom_target(qch_docs ${NEED_ALL}
-    COMMAND Qt5::qhelpgenerator "${DOC_OUTPUT_DIR}/qtwebkit/qtwebkit.qhp" -o "${DOC_OUTPUT_DIR}/qtwebkit.qch"
+    COMMAND Qt6::qhelpgenerator "${DOC_OUTPUT_DIR}/qtwebkit/qtwebkit.qhp" -o "${DOC_OUTPUT_DIR}/qtwebkit.qch"
     VERBATIM
 )
 add_dependencies(qch_docs html_docs)

Source/Qt6WebKitConfig.cmake.in

@@ -0,0 +1,13 @@
+@PACKAGE_INIT@
+@QTWEBKIT_PACKAGE_INIT@
+
+find_dependency_with_major_and_minor(Qt6Core @Qt6_VERSION_MAJOR@ @Qt6_VERSION_MINOR@)
+find_dependency_with_major_and_minor(Qt6Gui @Qt6_VERSION_MAJOR@ @Qt6_VERSION_MINOR@)
+find_dependency_with_major_and_minor(Qt6Network @Qt6_VERSION_MAJOR@ @Qt6_VERSION_MINOR@)
+
+include("${CMAKE_CURRENT_LIST_DIR}/WebKitTargets.cmake")
+
+set(_Qt6WebKit_MODULE_DEPENDENCIES "Gui;Network;Core")
+set(Qt6WebKit_DEFINITIONS -DQT_WEBKIT_LIB)
+
+@QTWEBKIT_PACKAGE_FOOTER@

Source/Qt6WebKitWidgetsConfig.cmake.in

@@ -0,0 +1,12 @@
+@PACKAGE_INIT@
+@QTWEBKIT_PACKAGE_INIT@
+
+find_dependency(Qt6WebKit @PROJECT_VERSION_STRING@ EXACT)
+find_dependency_with_major_and_minor(Qt6Widgets @Qt6_VERSION_MAJOR@ @Qt6_VERSION_MINOR@)
+
+include("${CMAKE_CURRENT_LIST_DIR}/Qt6WebKitWidgetsTargets.cmake")
+
+set(_Qt6WebKitWidgets_MODULE_DEPENDENCIES "WebKit;Widgets;Gui;Network;Core")
+set(Qt6WebKitWidgets_DEFINITIONS -DQT_WEBKITWIDGETS_LIB)
+
+@QTWEBKIT_PACKAGE_FOOTER@

Source/WTF/wtf/FileSystem.h

@@ -71,7 +71,9 @@ const PlatformFileHandle invalidPlatformFileHandle = -1;
 #endif
 
 // PlatformFileID
-#if OS(WINDOWS)
+#if USE(GLIB) && !OS(WINDOWS) && !PLATFORM(QT)
+typedef CString PlatformFileID;
+#elif OS(WINDOWS)
 typedef FILE_ID_128 PlatformFileID;
 #else
 typedef ino_t PlatformFileID;

Source/WTF/wtf/Platform.h

@@ -168,7 +168,7 @@
 #endif // QT_VERSION >= QT_VERSION_CHECK(5,8,0)
 
 #include <QtNetwork/qtnetwork-config.h>
-#if !QT_CONFIG(bearermanagement)
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) || !QT_CONFIG(bearermanagement)
 #ifndef QT_NO_BEARERMANAGEMENT
 #define QT_NO_BEARERMANAGEMENT
 #endif // QT_NO_BEARERMANAGEMENT

Source/WTF/wtf/PlatformQt.cmake

@@ -55,11 +55,11 @@ if (USE_MACH_PORTS)
 endif()
 
 list(APPEND WTF_SYSTEM_INCLUDE_DIRECTORIES
-    ${Qt5Core_INCLUDE_DIRS}
+    ${Qt6Core_INCLUDE_DIRS}
 )
 
 list(APPEND WTF_LIBRARIES
-    ${Qt5Core_LIBRARIES}
+    ${Qt6Core_LIBRARIES}
     Threads::Threads
 )
 

Source/WTF/wtf/qt/RunLoopQt.cpp

@@ -242,6 +242,12 @@ bool RunLoop::TimerBase::isActive() const
     return m_isActive;
 }
 
+Seconds RunLoop::TimerBase::secondsUntilFire() const
+{
+    // FIXME: implement for WebKit
+    return 0_s;
+}
+
 #include "RunLoopQt.moc"
 
 } // namespace WTF

Source/WTF/wtf/text/AtomString.h

@@ -126,7 +126,7 @@ class AtomString final {
 
 #if PLATFORM(QT)
     WTF_EXPORT_PRIVATE AtomString(const QString&);
-    WTF_EXPORT_PRIVATE AtomString(const QStringRef&);
+    WTF_EXPORT_PRIVATE AtomString(QStringView);
 #endif
 
 #if OS(WINDOWS)
@@ -160,7 +160,7 @@ static_assert(sizeof(AtomString) == sizeof(String), "AtomString and String must
 
 inline bool operator==(const AtomString& a, const AtomString& b) { return a.impl() == b.impl(); }
 inline bool operator==(const AtomString& a, ASCIILiteral b) { return WTF::equal(a.impl(), b); }
-inline bool operator==(const AtomString& a, const Vector<UChar>& b) { return a.impl() && equal(a.impl(), b.data(), b.size()); }    
+inline bool operator==(const AtomString& a, const Vector<UChar>& b) { return a.impl() && equal(a.impl(), b.data(), b.size()); }
 inline bool operator==(const AtomString& a, const String& b) { return equal(a.impl(), b.impl()); }
 inline bool operator==(const String& a, const AtomString& b) { return equal(a.impl(), b.impl()); }
 inline bool operator==(const Vector<UChar>& a, const AtomString& b) { return b == a; }

Source/WTF/wtf/text/WTFString.h

@@ -38,6 +38,9 @@
 #if PLATFORM(QT)
 QT_BEGIN_NAMESPACE
 class QString;
+class QStringView;
+class QLatin1String;
+class QByteArrayView;
 QT_END_NAMESPACE
 #endif
 
@@ -260,8 +263,15 @@ class String final {
 
 #if PLATFORM(QT)
     WTF_EXPORT_PRIVATE String(const QString&);
-    WTF_EXPORT_PRIVATE String(const QStringRef&);
+    WTF_EXPORT_PRIVATE String(QLatin1String);
+    WTF_EXPORT_PRIVATE String(QStringView);
+    WTF_EXPORT_PRIVATE String(QByteArrayView);
     WTF_EXPORT_PRIVATE operator QString() const;
+
+    // String(QStringView) makes for an ambiguous constructor, so we need to make these explicit
+    ALWAYS_INLINE String(Vector<UChar, 64> characters) : String(characters.data(), characters.size()) {}
+    ALWAYS_INLINE String(Vector<UChar, 32> characters) : String(characters.data(), characters.size()) {}
+    ALWAYS_INLINE String(Vector<UChar> characters) : String(characters.data(), characters.size()) {}
 #endif
 
 #if OS(WINDOWS)